From 44508e060616025d145637deb0b1bbc652a919fe Mon Sep 17 00:00:00 2001 From: Erik Simmler Date: Mon, 17 Jan 2011 10:00:30 -0500 Subject: [PATCH] ModelAdmin re-register now skips modeladmins without fieldsets already defined Was causing a "TypeError at /current/url/: unsupported operand type(s) for +: 'NoneType' and 'tuple'" --- categories/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/categories/admin.py b/categories/admin.py index e290052..3416889 100644 --- a/categories/admin.py +++ b/categories/admin.py @@ -102,7 +102,7 @@ class CategoryAdmin(TreeEditor, admin.ModelAdmin): admin.site.register(Category, CategoryAdmin) for model,modeladmin in admin.site._registry.items(): - if model in registry.values(): + if model in registry.values() and modeladmin.fieldsets: admin.site.unregister(model) admin.site.register(model, type('newadmin', (modeladmin.__class__,), { 'fieldsets': getattr(modeladmin, 'fieldsets', ()) + (('Categories',{