Merge branch 'release/1.3.1'

* release/1.3.1: bump version fixes issue when callable is used to manage permission in detail form update travis
saxix · Aug 25, 2016 · 6c9e299 · 6c9e299
2 parents 4b4f4c2 + 6d8a7ed
commit 6c9e299
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,8 @@
 language: python
+
+python:
+  - "3.5"
+
 sudo: false
 
 env:

diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,8 @@
+Release 1.3.1
+-------------
+* fixes issue when callable is used to manage permission in detail form
+
+
 Release 1.3
 -----------
 * fixes template check permissio issue

diff --git a/src/admin_extra_urls/__init__.py b/src/admin_extra_urls/__init__.py
@@ -3,7 +3,7 @@
 import os
 
 NAME = 'admin-extra-urls'
-VERSION = __version__ = (1, 3, 0, 'final', 0)
+VERSION = __version__ = (1, 3, 1, 'final', 0)
 __author__ = 'sax'
 
 

diff --git a/src/admin_extra_urls/extras.py b/src/admin_extra_urls/extras.py
@@ -125,7 +125,7 @@ def _inner(self, request, pk):
 
 
 def encapsulate(func):
-    def wrapper():
+    def wrapper(*args, **kwargs):
         return func
 
     return wrapper