Merge branch 'release/1.4.2'

 the commit.

Author: domdinicola

.bumpversion.cfg

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

CHANGES

@@ -1,3 +1,13 @@
+1.4.2
+-----
+* catch OSError when checking decorator
+
+
+1.4
+-----
+* add support for @decorators
+
+
 1.3.1
 -----
 * uses __str__ instead of __repr__ (DjangoDebugToolbar issue)

README.md

@@ -44,6 +44,8 @@ from admin_extra_buttons.api import ExtraButtonsMixin, button, confirm_action, l
 from admin_extra_buttons.utils import HttpResponseRedirectToReferrer
 from django.http import HttpResponse, JsonResponse
 from django.contrib import admin
+from django.views.decorators.clickjacking import xframe_options_sameorigin
+from django.views.decorators.csrf import csrf_exempt
 
 class MyModelModelAdmin(ExtraButtonsMixin, admin.ModelAdmin):
 
@@ -79,6 +81,13 @@ class MyModelModelAdmin(ExtraButtonsMixin, admin.ModelAdmin):
     def api4(self, request):
         return HttpResponse("Basic Authentication allowed")
 
+    @view(decorators=[csrf_exempt, xframe_options_sameorigin])
+    def preview(self, request):
+        if request.method == "POST":
+            return HttpResponse("POST")
+        return HttpResponse("GET")
+            
+
 ```
 
 #### Project Links

src/admin_extra_buttons/__init__.py

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

src/admin_extra_buttons/handlers.py

@@ -14,7 +14,7 @@ def __init__(self, func, **kwargs):
         self.func._handler = self
         self.config = kwargs
         self.model_admin = kwargs.get('model_admin', None)
-
+        self.decorators = kwargs.get('decorators', [])
         self.login_required = kwargs.get('login_required', True)
         self._pattern = kwargs.get('pattern', None)
         self.permission = kwargs.get('permission')

src/admin_extra_buttons/mixins.py

@@ -11,7 +11,7 @@
 from django.template.response import TemplateResponse
 from django.urls import path, reverse
 
-from .handlers import BaseExtraHandler
+from .handlers import BaseExtraHandler, ViewHandler
 
 logger = logging.getLogger(__name__)
 
@@ -90,7 +90,7 @@ def check(cls, **kwargs):
         try:
             from admin_extra_buttons.utils import check_decorator_errors
             errors.extend(check_decorator_errors(cls))
-        except (OperationalError, ProgrammingError):  # pragma: no cover
+        except (OSError, OperationalError, ProgrammingError):  # pragma: no cover
             pass
         return errors
 
@@ -133,11 +133,15 @@ def get_urls(self):
                 if callable(method) and isinstance(method, BaseExtraHandler):
                     handlers[method_name] = method.get_instance(self)
 
+        handler: ViewHandler
         for handler in handlers.values():
             handler.url_name = f'{opts.app_label}_{opts.model_name}_{handler.func.__name__}'
             if handler.url_pattern:
+                f = partial(getattr(self, handler.func.__name__), self)
+                for deco in handler.decorators[::-1]:
+                    f = deco(f)
                 extra_urls.append(path(handler.url_pattern,
-                                       partial(getattr(self, handler.func.__name__), self),
+                                       f,
                                        name=handler.url_name))
             if hasattr(handler, 'button_class'):
                 self.extra_button_handlers[handler.func.__name__] = handler

src/admin_extra_buttons/templates/admin_extra_buttons/change_list.html

@@ -1,6 +1,6 @@
 {% extends "admin/change_list.html" %}{% load extra_buttons %}
 {% block object-tools-items %}
-    {% for n in cl.model_admin.names %}<div>{{ n }}</div>{% endfor %}
+{#    {% for n in cl.model_admin.names %}<div>{{ n }}</div>{% endfor %}#}
     {{ block.super }}
     {% include "admin_extra_buttons/includes/change_list_buttons.html" %}
 {% endblock %}

src/admin_extra_buttons/templates/admin_extra_buttons/includes/change_form_buttons.html

@@ -1,5 +1,4 @@
 {% load extra_buttons i18n static admin_list admin_urls %}
-{{ extra_buttons }}
 {% get_changeform_buttons adminform.model_admin as buttons %}
 {% for button in buttons %}
     {% if button.can_render and button.change_form %}