Briq
/
django-admin-sortable-fixwin
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Play nice with other apps which dynamically choose `change_form_template` 

If other app admin class is using `property` for `change_form_template` adminsortable fails.
master
Venelin Stoykov 2016-06-23 16:02:01 +03:00
parent 344927a393
commit 2697422497
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
adminsortable/admin.py
View File

@ -80,6 +80,22 @@ class SortableAdmin(SortableAdminBase, ModelAdmin):
class Meta: class Meta:
abstract = True abstract = True
@property
def has_sortable_tabular_inlines(self):
base_classes = (SortableTabularInline, SortableGenericTabularInline)
return any(issubclass(klass, base_classes) for klass in self.inlines)
@property
def has_sortable_stacked_inlines(self):
base_classes = (SortableStackedInline, SortableGenericStackedInline)
return any(issubclass(klass, base_classes) for klass in self.inlines)
@property
def change_form_template(self):
if self.has_sortable_tabular_inlines or self.has_sortable_stacked_inlines:
return self.sortable_change_form_template
return super(SortableAdmin, self).change_form_template
def get_urls(self): def get_urls(self):
urls = super(SortableAdmin, self).get_urls() urls = super(SortableAdmin, self).get_urls()
@ -224,37 +240,17 @@ class SortableAdmin(SortableAdminBase, ModelAdmin):
extra_context=extra_context) extra_context=extra_context)
def change_view(self, request, object_id, form_url='', extra_context=None): def change_view(self, request, object_id, form_url='', extra_context=None):
self.has_sortable_tabular_inlines = False
self.has_sortable_stacked_inlines = False
if extra_context is None: if extra_context is None:
extra_context = {} extra_context = {}
extra_context.update({ extra_context.update({
'change_form_template_extends': self.change_form_template_extends, 'change_form_template_extends': self.change_form_template_extends,
'has_sortable_tabular_inlines': self.has_sortable_tabular_inlines,
'has_sortable_stacked_inlines': self.has_sortable_stacked_inlines,
'csrf_cookie_name': getattr(settings, 'CSRF_COOKIE_NAME', 'csrftoken') 'csrf_cookie_name': getattr(settings, 'CSRF_COOKIE_NAME', 'csrftoken')
}) })
for klass in self.inlines:
if issubclass(klass, SortableTabularInline) or issubclass(klass,
SortableGenericTabularInline):
self.has_sortable_tabular_inlines = True
if issubclass(klass, SortableStackedInline) or issubclass(klass,
SortableGenericStackedInline):
self.has_sortable_stacked_inlines = True
if self.has_sortable_tabular_inlines or \
self.has_sortable_stacked_inlines:
self.change_form_template = self.sortable_change_form_template
extra_context.update({
'has_sortable_tabular_inlines':
self.has_sortable_tabular_inlines,
'has_sortable_stacked_inlines':
self.has_sortable_stacked_inlines
})
return super(SortableAdmin, self).change_view(request, object_id, return super(SortableAdmin, self).change_view(request, object_id,
form_url='', extra_context=extra_context) form_url='', extra_context=extra_context)