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

Remove exception.

fix_request_path_info
Chad Shryock 2014-09-17 08:30:12 -04:00
parent b9654b7138
commit cc53b3003e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
polymorphic/admin.py
View File

@ -237,10 +237,12 @@ class PolymorphicParentModelAdmin(admin.ModelAdmin):
def get_queryset(self, request): def get_queryset(self, request):
# optimize the list display. # optimize the list display.
try: parent_self = super(PolymorphicParentModelAdmin, self)
qs = super(PolymorphicParentModelAdmin, self).get_queryset(request) if hasattr(parent_self, 'get_queryset'):
except: qs = parent_self.get_queryset(request)
qs = super(PolymorphicParentModelAdmin, self).queryset(request) else:
qs = parent_self.queryset(request)
if not self.polymorphic_list: if not self.polymorphic_list:
qs = qs.non_polymorphic() qs = qs.non_polymorphic()
return qs return qs
@ -281,10 +283,8 @@ class PolymorphicParentModelAdmin(admin.ModelAdmin):
Expose the custom URLs for the subclasses and the URL resolver. Expose the custom URLs for the subclasses and the URL resolver.
""" """
urls = super(PolymorphicParentModelAdmin, self).get_urls() urls = super(PolymorphicParentModelAdmin, self).get_urls()
try: meta = self.model._meta
info = self.model._meta.app_label, self.model._meta.model_name info = meta.app_label, getattr(meta, 'model_name', meta.module_name)
except:
info = self.model._meta.app_label, self.model._meta.module_name
# 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.