Briq
/
django-polymorphic
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #87 from krayevidi/master 

Adds pk_regex attr in PolymorphicParentModelAdmin
fix_request_path_info
Diederik van der Boor 2014-07-08 17:14:54 +02:00
parent ba941165ab d8d6f07f71
commit 2e2728e2c6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
polymorphic/admin.py
View File

@ -102,6 +102,8 @@ class PolymorphicParentModelAdmin(admin.ModelAdmin):
add_type_template = None add_type_template = None
add_type_form = PolymorphicModelChoiceForm add_type_form = PolymorphicModelChoiceForm
pk_regex = '(\d+)'
def __init__(self, model, admin_site, *args, **kwargs): def __init__(self, model, admin_site, *args, **kwargs):
@ -247,7 +249,7 @@ class PolymorphicParentModelAdmin(admin.ModelAdmin):
# Patch the change URL so it's not a big catch-all; allowing all custom URLs to be added to the end. # Patch the change URL so it's not a big catch-all; allowing all custom URLs to be added to the end.
# The url needs to be recreated, patching url.regex is not an option Django 1.4's LocaleRegexProvider changed it. # The url needs to be recreated, patching url.regex is not an option Django 1.4's LocaleRegexProvider changed it.
new_change_url = url(r'^(\d+)/$', self.admin_site.admin_view(self.change_view), name='{0}_{1}_change'.format(*info)) new_change_url = url(r'^{0}/$'.format(self.pk_regex), self.admin_site.admin_view(self.change_view), name='{0}_{1}_change'.format(*info))
for i, oldurl in enumerate(urls): for i, oldurl in enumerate(urls):
if oldurl.name == new_change_url.name: if oldurl.name == new_change_url.name:
urls[i] = new_change_url urls[i] = new_change_url