Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed admin creation of objects. Removed code zombies.

Browse source
This commit is contained in:
Jonathan Piacenti 2015-02-21 12:59:47 -06:00
parent 16ce5afb96
commit f1149c40cb
1 changed files with 4 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/objects/admin.py
View file

@ -6,6 +6,7 @@
from django import forms from django import forms
from django.conf import settings from django.conf import settings
from django.contrib import admin from django.contrib import admin
from django.contrib.admin.utils import flatten_fieldsets
from src.typeclasses.admin import AttributeInline, TagInline from src.typeclasses.admin import AttributeInline, TagInline
from src.objects.models import ObjectDB from src.objects.models import ObjectDB
@ -62,7 +63,6 @@ class ObjectDBAdmin(admin.ModelAdmin):
save_on_top = True save_on_top = True
list_select_related = True list_select_related = True
list_filter = ('db_typeclass_path',) list_filter = ('db_typeclass_path',)
#list_filter = ('db_permissions', 'db_typeclass_path')
# editing fields setup # editing fields setup
@ -73,16 +73,7 @@ class ObjectDBAdmin(admin.ModelAdmin):
('db_location', 'db_home'), 'db_destination','db_cmdset_storage' ('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_form = ObjectCreateForm
add_fieldsets = ( add_fieldsets = (
(None, { (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): def get_fieldsets(self, request, obj=None):
if not obj: if not obj:
return self.add_fieldsets return self.add_fieldsets
@ -109,9 +94,9 @@ class ObjectDBAdmin(admin.ModelAdmin):
defaults = {} defaults = {}
if obj is None: if obj is None:
defaults.update({ defaults.update({
'form': self.add_form, 'form': self.add_form,
'fields': admin.util.flatten_fieldsets(self.add_fieldsets), 'fields': flatten_fieldsets(self.add_fieldsets),
}) })
defaults.update(kwargs) defaults.update(kwargs)
return super(ObjectDBAdmin, self).get_form(request, obj, **defaults) return super(ObjectDBAdmin, self).get_form(request, obj, **defaults)