From f1149c40cb1427687d59c2a759c347b1ded5ae13 Mon Sep 17 00:00:00 2001
From: Jonathan Piacenti <kelketek@gmail.com>
Date: Sat, 21 Feb 2015 12:59:47 -0600
Subject: [PATCH] Fixed admin creation of objects. Removed code zombies.

---
 src/objects/admin.py | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/src/objects/admin.py b/src/objects/admin.py
index 078700cc1..4f8db3e77 100644
--- a/src/objects/admin.py
+++ b/src/objects/admin.py
@@ -6,6 +6,7 @@
 from django import forms
 from django.conf import settings
 from django.contrib import admin
+from django.contrib.admin.utils import flatten_fieldsets
 from src.typeclasses.admin import AttributeInline, TagInline
 from src.objects.models import ObjectDB
 
@@ -62,7 +63,6 @@ class ObjectDBAdmin(admin.ModelAdmin):
     save_on_top = True
     list_select_related = True
     list_filter = ('db_typeclass_path',)
-    #list_filter = ('db_permissions', 'db_typeclass_path')
 
     # editing fields setup
 
@@ -73,16 +73,7 @@ class ObjectDBAdmin(admin.ModelAdmin):
                            ('db_location', 'db_home'), 'db_destination','db_cmdset_storage'
                            )}),
         )
-    #fieldsets = (
-    #    (None, {
-    #            'fields': (('db_key','db_typeclass_path'), ('db_permissions', 'db_lock_storage'),
-    #                       ('db_location', 'db_home'), 'db_destination','db_cmdset_storage'
-    #                       )}),
-    #    )
 
-    #deactivated temporarily, they cause empty objects to be created in admin
-
-    # Custom modification to give two different forms wether adding or not.
     add_form = ObjectCreateForm
     add_fieldsets = (
         (None, {
@@ -91,12 +82,6 @@ class ObjectDBAdmin(admin.ModelAdmin):
                            )}),
         )
 
-    #add_fieldsets = (
-    #    (None, {
-    #            'fields': (('db_key','db_typeclass_path'), 'db_permissions',
-    #                       ('db_location', 'db_home'), 'db_destination', 'db_cmdset_storage'
-    #                       )}),
-    #    )
     def get_fieldsets(self, request, obj=None):
         if not obj:
             return self.add_fieldsets
@@ -109,9 +94,9 @@ class ObjectDBAdmin(admin.ModelAdmin):
         defaults = {}
         if obj is None:
             defaults.update({
-                    'form': self.add_form,
-                    'fields': admin.util.flatten_fieldsets(self.add_fieldsets),
-                    })
+                'form': self.add_form,
+                'fields': flatten_fieldsets(self.add_fieldsets),
+            })
             defaults.update(kwargs)
         return super(ObjectDBAdmin, self).get_form(request, obj, **defaults)