From 2f2aeff0ec44630ae3cb69834ce05d08cf50a863 Mon Sep 17 00:00:00 2001 From: Brandon Taylor Date: Sat, 3 Sep 2011 22:46:05 -0500 Subject: [PATCH] Fixed if statements so they won't bomb if inline class doesn't subclass sortable. --- adminsortable/admin.py | 8 ++++++-- sample_project/adminsortable.sqlite | Bin 54272 -> 54272 bytes 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/adminsortable/admin.py b/adminsortable/admin.py index ba88351..897c91a 100644 --- a/adminsortable/admin.py +++ b/adminsortable/admin.py @@ -25,8 +25,12 @@ class SortableAdmin(ModelAdmin): self.has_sortable_tabular_inlines = False self.has_sortable_stacked_inlines = False for klass in self.inlines: - if issubclass(klass, SortableTabularInline) and klass.model.is_sortable(): self.has_sortable_tabular_inlines = True - if issubclass(klass, SortableStackedInline) and klass.model.is_sortable(): self.has_sortable_stacked_inlines = True + if issubclass(klass, SortableTabularInline): + if klass.model.is_sortable(): + self.has_sortable_tabular_inlines = True + if issubclass(klass, SortableStackedInline): + if klass.model.is_sortable(): + self.has_sortable_stacked_inlines = True def get_urls(self): urls = super(SortableAdmin, self).get_urls() diff --git a/sample_project/adminsortable.sqlite b/sample_project/adminsortable.sqlite index 2cb981ef00002128d942d01228f29ddd458973db..a3ce8f993476c87960de14d33447774c0c568d29 100644 GIT binary patch delta 114 zcmZoz!Q8Ndd4e?Khlw)Ij2|{8G_4n9WDHKs$*By^%`C|fU}R%pWE2)>+WdXJ5D)Vg z=3kq6_Pk+cXJle!W@KdA{D1##ZUH7nzxA=h{<2w+=K=HN S3&&a6m_e$UH~&1(&H?~W$RoP| delta 122 zcmZoz!Q8Ndd4e?K-H9^JjCVICG_4n9Vhm2q$*By^%`C|fU}R%pWE2)>-28pL5D)V& z<}aIh_Pk+cXJTSyW@KdC{D1##ZUJUSzx