Merge branch 'release/1.5.1'

* release/1.5.1:
  Bump version: 1.5.0 → 1.5.1
  bug fixes

Author: saxix

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.5.0
+current_version = 1.5.1
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)
 serialize = {major}.{minor}.{patch}
 commit = True

CHANGES

@@ -1,3 +1,8 @@
+1.5.1
+-----
+* bug fixing
+
+
 1.5
 -----
 * pass `handler` to permission callable

src/admin_extra_buttons/__init__.py

@@ -1,3 +1,3 @@
 NAME = 'django-admin-extra-buttons'
-VERSION = __version__ = '1.5.0'
+VERSION = __version__ = '1.5.1'
 __author__ = 'sax'

src/admin_extra_buttons/handlers.py

@@ -37,6 +37,7 @@ def name(self):
 
     def __call__(self, model_admin, request, *args, **kwargs):
         obj = None
+        self.model_admin = model_admin
         if len(self.sig.parameters) > 2:
             pk = kwargs.get(list(self.sig.parameters)[2])
             obj = model_admin.get_object(request, pk)
@@ -96,13 +97,23 @@ def __init__(self, func, html_attrs=None,
                          **kwargs)
 
     def get_button_params(self, context, **extra):
+        request = context['request']
+        if callable(self.enabled):
+            enabled = bool(self.enabled(request))
+        else:
+            enabled = self.enabled
+
+        if callable(self.visible):
+            visible = bool(self.visible(request))
+        else:
+            visible = self.visible
         return {'label': self.config.get('label', labelize(self.name)),
                 'handler': self,
                 'html_attrs': self.html_attrs,
                 'change_list': self.change_list,
                 'change_form': self.change_form,
-                'visible': self.visible,
-                'enabled': self.enabled,
+                'visible': visible,
+                'enabled': enabled,
                 'context': context,
                 'login_required': self.login_required,
                 'permission': self.permission,