From d90dccda01ce23f03ab6488166abccb407943adb Mon Sep 17 00:00:00 2001 From: Corey Oordt Date: Mon, 16 May 2011 08:57:29 -0400 Subject: [PATCH] Fixed a problem in the new admin creation where it wouldn't properly filter out the category fields by model --- categories/admin.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/categories/admin.py b/categories/admin.py index 9d1c705..a100e1c 100644 --- a/categories/admin.py +++ b/categories/admin.py @@ -101,10 +101,10 @@ class CategoryAdmin(TreeEditor, admin.ModelAdmin): admin.site.register(Category, CategoryAdmin) -for model,modeladmin in admin.site._registry.items(): +for model, modeladmin in admin.site._registry.items(): if model in registry.values() and modeladmin.fieldsets: fieldsets = getattr(modeladmin, 'fieldsets', ()) - fields = [cat.split('.')[1] for cat in registry] + fields = [cat.split('.')[1] for cat in registry if registry[cat] == model] # check each field to see if already defined for cat in fields: for k,v in fieldsets: @@ -112,9 +112,10 @@ for model,modeladmin in admin.site._registry.items(): fields.remove(cat) # if there are any fields left, add them under the categories fieldset if len(fields) > 0: + print fields admin.site.unregister(model) admin.site.register(model, type('newadmin', (modeladmin.__class__,), { - 'fieldsets': fieldsets + (('Categories',{ + 'fieldsets': fieldsets + (('Categories', { 'fields': fields }),) }))