From 0a39b8f65ebb0a3f4207fbdc414dc62f539a8ce1 Mon Sep 17 00:00:00 2001 From: Griatch Date: Fri, 24 May 2013 21:10:31 +0200 Subject: [PATCH] Webserver move to Server is finished and everything seems to work normally. --- src/objects/admin.py | 3 ++- src/utils/idmapper/base.py | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/objects/admin.py b/src/objects/admin.py index 81d3f96501..cf9a66449d 100644 --- a/src/objects/admin.py +++ b/src/objects/admin.py @@ -80,7 +80,7 @@ class ObjectDBAdmin(admin.ModelAdmin): ) #deactivated temporarily, they cause empty objects to be created in admin - inlines = [AliasInline]#, ObjAttributeInline] + #inlines = [AliasInline, ObjAttributeInline] # Custom modification to give two different forms wether adding or not. @@ -111,6 +111,7 @@ class ObjectDBAdmin(admin.ModelAdmin): return super(ObjectDBAdmin, self).get_form(request, obj, **defaults) def save_model(self, request, obj, form, change): + obj.save() if not change: # adding a new object obj = obj.typeclass diff --git a/src/utils/idmapper/base.py b/src/utils/idmapper/base.py index df110b4ad6..5e6032c60a 100755 --- a/src/utils/idmapper/base.py +++ b/src/utils/idmapper/base.py @@ -180,7 +180,6 @@ class SharedMemoryModel(Model): super(SharedMemoryModel, cls).save(*args, **kwargs) else: # in another thread; make sure to save in reactor thread - print "saving in another thread!" def _save_callback(cls, *args, **kwargs): super(SharedMemoryModel, cls).save(*args, **kwargs) #blockingCallFromThread(reactor, _save_callback, cls, *args, **kwargs)