Merge branch 'release/1.5'

* release/1.5:
  Bump version: 1.4.2 → 1.5.0
  lint
  updates CHANGES
  pass `handler` to permission callable
  fixes 'confirm_action'
  Bump version: 1.4.0 → 1.4.1
  dj41

Author: saxix

.bumpversion.cfg

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

.github/workflows/test.yml

@@ -28,8 +28,8 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                python-version: [ "3.9"]
-                django-version: [ "2.2", "3.2", "4.0" ]
+                python-version: [ "3.9", "3.10"]
+                django-version: [ "2.2", "3.2", "4.0", "4.1" ]
         env:
             PY_VER: ${{ matrix.python-version}}
             DJ_VER: ${{ matrix.django-version}}

CHANGES

@@ -1,3 +1,8 @@
+1.5
+-----
+* pass `handler` to permission callable
+
+
 1.4.2
 -----
 * catch OSError when checking decorator

README.md

@@ -20,6 +20,7 @@ Three decorators are available:
 - ``button()`` to mark a method as extra view and show related button
 - ``link()`` This is used for "external" link, where you don't need to invoke local views.
 - ``view()`` View only decorator, this adds a new url but do not render any button.
+- ``choice()`` Menu like button, can be used to group multiple @views().
 
 
 Install

setup.cfg

@@ -1,9 +1,3 @@
-[pep8]
-ignore = E501,E401,W391,E128,E261,E731
-max-line-length = 160
-exclude = .tox,migrations,.git,docs,diff_match_patch.py,deploy/**,settings,sheet_template
-
-
 [flake8]
 max-complexity = 14
 max-line-length = 120

setup.py

@@ -35,7 +35,6 @@ def read(*parts):
                 'pytest-cov',
                 'pytest-django',
                 'pytest-echo',
-                'pytest-pythonpath',
                 'tox>=2.3',
                 'wheel',
                 ]

src/admin_extra_buttons/__init__.py

@@ -1,5 +1,3 @@
-default_app_config = 'admin_extra_buttons.apps.Config'
-
 NAME = 'django-admin-extra-buttons'
-VERSION = __version__ = '1.4.2'
+VERSION = __version__ = '1.5.0'
 __author__ = 'sax'

src/admin_extra_buttons/buttons.py

@@ -95,7 +95,8 @@ def original(self):
     def authorized(self):
         if self.handler.permission:
             try:
-                return check_permission(self.handler.permission, self.request, self.original)
+                return check_permission(self.handler,
+                                        self.handler.permission, self.request, self.original)
             except PermissionDenied:
                 return False
         return True

src/admin_extra_buttons/handlers.py

@@ -42,7 +42,7 @@ def __call__(self, model_admin, request, *args, **kwargs):
             obj = model_admin.get_object(request, pk)
 
         if self.permission:
-            check_permission(self.permission, request, obj)
+            check_permission(self, self.permission, request, obj)
         elif self.login_required and not request.user.is_authenticated:
             raise PermissionDenied
 

src/admin_extra_buttons/mixins.py

@@ -34,7 +34,7 @@ def confirm_action(modeladmin, request,
                    template='admin_extra_buttons/confirm.html',
                    error_message=None):
     opts = modeladmin.model._meta
-    if extra_context and title:
+    if extra_context:
         title = extra_context.pop('title', title)
     context = modeladmin.get_common_context(request,
                                             message=message,
@@ -78,7 +78,7 @@ class ExtraButtonsMixin:
         change_form_template = 'admin_extra_buttons/change_form.html'
 
     def __init__(self, model, admin_site):
-        self.extra_button_handlers = []
+        self.extra_button_handlers = {}
         super().__init__(model, admin_site)
 
     def message_error_to_user(self, request, exception):