Merge branch 'release/1.5.2'

* release/1.5.2:
  bump version
  Bump version: 1.5.1 → 1.5.2
  bug fixes

Author: saxix

.bumpversion.cfg

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

CHANGES

@@ -1,3 +1,8 @@
+1.5.2
+-----
+* bug fixing
+
+
 1.5.1
 -----
 * bug fixing

src/admin_extra_buttons/__init__.py

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

src/admin_extra_buttons/buttons.py

@@ -17,8 +17,8 @@ def __init__(self, handler, context, label=None, visible=True, enabled=True,
         self.href = config.get('href', None)
         self.config = config
         self.handler = handler
-        self.visible = visible
-        self.enabled = enabled
+        self._visible = visible
+        self._enabled = enabled
         self.template = template or self.default_template
         self.context: RequestContext = context
         self.disable_on_click = True
@@ -56,29 +56,42 @@ def html_attrs(self):
         if self.disable_on_edit and "aeb-disable_on_edit" not in css_class:
             css_class += " aeb-disable_on_edit"
 
-        # enabled
         css_class = css_class.replace("disabled", "")
-        if not self.enabled:
-            css_class += " disabled"
-        elif callable(self.enabled) and not self.enabled(self):
+        if self.enabled:
+            css_class += " enabled"
+        else:
             css_class += " disabled"
 
         attrs['class'] = css_class
         return attrs
 
     def can_render(self):
-        return self.authorized() and self.url and self.is_visible()
+        return self.authorized() and self.url and self.visible
+
+    @property
+    def enabled(self):
+        if not self.context:  # pragma: no cover
+            raise ValueError("Button not initialised.")
+        if callable(self._enabled):
+            try:
+                return self._enabled(self)
+            except Exception:  # pragma: no cover
+                raise
+                return False
 
-    def is_visible(self):
+        return self._enabled
+
+    @property
+    def visible(self):
         if not self.context:  # pragma: no cover
             raise ValueError("Button not initialised.")
-        if callable(self.visible):
+        if callable(self._visible):
             try:
-                return self.visible(self)
+                return self._visible(self)
             except Exception:  # pragma: no cover
                 return False
 
-        return self.visible
+        return self._visible
 
     @property
     def request(self):
@@ -103,6 +116,8 @@ def authorized(self):
 
     @property
     def url(self):
+        if not self.enabled:
+            return '#'
         func = self.config.get('get_url', self.get_url)
         return func(self.context)
 

src/admin_extra_buttons/handlers.py

@@ -97,23 +97,13 @@ 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': visible,
-                'enabled': enabled,
+                'visible': self.visible,
+                'enabled': self.enabled,
                 'context': context,
                 'login_required': self.login_required,
                 'permission': self.permission,