Merge branch 'release/1.3'

* release/1.3:
  update CHANGES
  add migrations of demo application
  fixes tox config
  fixes wrong PermissionDenied import
  fixes template check permissio issue

.travis.yml

@@ -2,27 +2,25 @@ language: python
 sudo: false
 
 env:
-  - TESTENV=py27-d17
   - TESTENV=py27-d18
   - TESTENV=py27-d19
+  - TESTENV=py27-d110
 
-  - TESTENV=py33-d17
   - TESTENV=py33-d18
 
-  - TESTENV=py34-d17
   - TESTENV=py34-d18
   - TESTENV=py34-d19
+  - TESTENV=py34-d110
 
-  # - TESTENV=py35-d16
-  # - TESTENV=py35-d17
-  # - TESTENV=py35-d18
-  # - TESTENV=py35-d19
+  - TESTENV=py35-d18
+  - TESTENV=py35-d19
+  - TESTENV=py35-d110
 
 install:
   - pip install tox "coverage<=4.0" "coveralls>=0.5" codecov
 
 script:
-  - tox -e $TESTENV -- py.test tests --cov=admin_extra_urls --cov-report=xml --cov-config=tests/.coveragerc
+  - tox -e $TESTENV
 
 after_success:
   - coverage combine

CHANGES

@@ -1,3 +1,7 @@
+Release 1.3
+-----------
+* fixes template check permissio issue
+
 Release 1.2
 -----------
 * check permission before run action/link

src/admin_extra_urls/__init__.py

@@ -3,7 +3,7 @@
 import os
 
 NAME = 'admin-extra-urls'
-VERSION = __version__ = (1, 2, 0, 'final', 0)
+VERSION = __version__ = (1, 3, 0, 'final', 0)
 __author__ = 'sax'
 
 

src/admin_extra_urls/extras.py

@@ -20,6 +20,7 @@ def labelize(label):
 class ExtraUrlConfigException(RuntimeError):
     pass
 
+
 IS_GRAPPELLI_INSTALLED = 'grappelli' in settings.INSTALLED_APPS
 
 opts = namedtuple('UrlOptions', 'path,label,icon,perm,order,css_class,visible')
@@ -40,6 +41,9 @@ def link(path=None, label=None, icon='', permission=None,
     :param required permission to run the action
 
     """
+    if callable(permission):
+        permission = encapsulate(permission)
+
 
     def link_decorator(func):
         def _inner(self, *args, **kwargs):
@@ -83,6 +87,9 @@ def action(path=None, label=None, icon='', permission=None,
 
     """
 
+    if callable(permission):
+        permission = encapsulate(permission)
+
     def action_decorator(func):
         def _inner(self, request, pk):
             obj = self.model.objects.get(pk=pk)
@@ -117,6 +124,13 @@ def _inner(self, request, pk):
     return action_decorator
 
 
+def encapsulate(func):
+    def wrapper():
+        return func
+
+    return wrapper
+
+
 class ExtraUrlMixin(object):
     """
     Allow to add new 'url' to the standard ModelAdmin

src/admin_extra_urls/templates/admin_extra_urls/includes/change_list_buttons.html

@@ -1,7 +1,7 @@
 {% load extra_urls i18n admin_static admin_list admin_urls %}
 
 {% for method_name,urlattrs in cl.model_admin.extra_buttons %}
-    {% has_permission urlattrs.perm as authorized %}
+    {% has_permission urlattrs as authorized %}
     {% if authorized and urlattrs.visible %}
         {% spaceless %}<li>
             <a id="btn-{{method_name}}" href="{% url cl.opts|admin_urlname:method_name %}{% if is_popup %}?_popup=1{% endif %}"

src/admin_extra_urls/templatetags/extra_urls.py

@@ -3,6 +3,7 @@
 
 from django import template
 from django.contrib.admin.templatetags.admin_urls import admin_urlname
+from django.core.exceptions import PermissionDenied
 from django.core.urlresolvers import reverse
 from django.template import Node, TemplateSyntaxError
 
@@ -14,7 +15,14 @@ def has_permission(context, perm_name):
     if not perm_name:
         return True
     request = context['request']
-    return request.user.has_perm(perm_name)
+    user = request.user
+    if callable(perm_name):
+        try:
+            return perm_name(request, context.get('original', None))
+        except PermissionDenied:
+            return False
+    else:
+        return  user.has_perm(perm_name)
 
 
 class NewlinelessNode(template.Node):

tests/demoapp/demo/migrations/0001_initial.py

@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.6 on 2016-08-22 09:47
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='DemoModel1',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='DemoModel2',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='DemoModel3',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255)),
+            ],
+        ),
+    ]

tests/demoapp/demo/settings.py

@@ -83,7 +83,10 @@
         'DIRS': [],
         'APP_DIRS': True,
         'OPTIONS': {
-            'context_processors': ['django.contrib.messages.context_processors.messages']
+            'context_processors': ['django.contrib.messages.context_processors.messages',
+                                   'django.contrib.auth.context_processors.auth',
+                                   "django.template.context_processors.request",
+            ]
         },
     },
 ]

tests/manage.py

@@ -3,6 +3,9 @@
 import sys
 
 if __name__ == '__main__':
+    here = os.path.dirname(__file__)
+
+    sys.path.append(os.path.join(here, 'demoapp'))
     os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'demo.settings')
 
     from django.core.management import execute_from_command_line

tox.ini

@@ -1,7 +1,8 @@
 [tox]
-envlist = {py27}-{d17,d18,d19,dtrunk}
-          {py33}-{d17,d18}
-          {py34,py35}-{d18,d19,dtrunk}
+envlist = {py27}-{d18,d19,d110,dtrunk}
+          {py33}-{d18}
+          {py34}-{d18,d19,d110}
+          {py35}-{d18,d19,d110,dtrunk}
 
 [pytest]
 python_paths=./tests/demoapp/
@@ -34,7 +35,8 @@ deps=
     d17: django>=1.7,<1.8
     d18: django>=1.8,<1.9
     d19: django>=1.9,<1.10
-    dtrunk: django>=1.10.dev,<1.11
+    d110: django>=1.10,<1.11
+    dtrunk: django>=1.11.dev,<1.12
     coverage: django
 
 commands =
@@ -53,20 +55,21 @@ ignore_outcome = True
 
 [testenv:py35-d18]
 commands =
-    {posargs: py.test tests --cov=admin_extra_urls --cov-report=xml \
-        --cov-config=tests/.coveragerc --create-db --assert=plain}
+    {posargs: py.test tests --cov=admin_extra_urls --cov-report=xml --cov-config=tests/.coveragerc --create-db --assert=plain}
 
 [testenv:py35-d19]
 commands =
-    {posargs: py.test tests --cov=admin_extra_urls --cov-report=xml \
-        --cov-config=tests/.coveragerc --create-db --assert=plain}
+    {posargs: py.test tests/ --cov=admin_extra_urls --cov-report=xml --cov-config=tests/.coveragerc --create-db --assert=plain}
+
+[testenv:py35-d110]
+commands =
+    {posargs: py.test tests --cov=admin_extra_urls --cov-report=xml --cov-config=tests/.coveragerc --create-db --assert=plain}
 
 
 [testenv:py35-dtrunk]
 pip_pre = True
 ignore_outcome = True
 commands =
-    {posargs: py.test tests --cov=admin_extra_urls --cov-report=xml \
-        --cov-config=tests/.coveragerc --create-db --assert=plain}
+    {posargs: py.test tests --cov=admin_extra_urls --cov-report=xml --cov-config=tests/.coveragerc --create-db --assert=plain}