Merge branch 'release/1.5.3'

* release/1.5.3:
  Bump version: 1.5.2 → 1.5.3
  customise view authentication handler
  bug fixes

Author: saxix

.bumpversion.cfg

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

CHANGES

@@ -1,3 +1,9 @@
+1.5.3
+-----
+* bug fixing
+* add ability to customise view authentication handler
+
+
 1.5.2
 -----
 * bug fixing

src/admin_extra_buttons/__init__.py

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

src/admin_extra_buttons/buttons.py

@@ -76,11 +76,14 @@ def enabled(self):
             try:
                 return self._enabled(self)
             except Exception:  # pragma: no cover
-                raise
                 return False
 
         return self._enabled
 
+    @property
+    def model_admin(self):
+        return self.handler.model_admin
+
     @property
     def visible(self):
         if not self.context:  # pragma: no cover

src/admin_extra_buttons/handlers.py

@@ -55,17 +55,25 @@ def __call__(self, model_admin, request, *args, **kwargs):
 
 
 class ViewHandler(BaseExtraHandler):
-    def __init__(self, func, login_required=True, http_basic_auth=False, **kwargs):
+    def __init__(self, func, login_required=True, http_basic_auth=False, http_auth_handler=None, **kwargs):
         self.login_required = login_required
-        self.http_basic_auth = http_basic_auth
+        if http_auth_handler:
+            if http_basic_auth:
+                raise ValueError("'http_basic_auth' and 'http_auth_handler' are mutually exclusive")
+            self.http_auth_handler = http_auth_handler
+        else:
+            self.http_basic_auth = http_basic_auth
+            self.http_auth_handler = handle_basic_auth
         super().__init__(func,
+                         http_auth_handler=http_auth_handler,
                          http_basic_auth=http_basic_auth,
                          login_required=login_required,
                          **kwargs)
 
     def __call__(self, model_admin, request, *args, **kwargs):
+        self.model_admin = model_admin
         if self.login_required and self.http_basic_auth and not request.user.is_authenticated:
-            handle_basic_auth(request)
+            self.http_auth_handler(request)
         return super().__call__(model_admin, request, *args, **kwargs)
 
     @cached_property