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

Webserver move to Server is finished and everything seems to work normally.

Browse source
This commit is contained in:
Griatch 2013-05-24 21:10:31 +02:00
parent 70ea21dab8
commit 0a39b8f65e
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/objects/admin.py
View file

@ -80,7 +80,7 @@ class ObjectDBAdmin(admin.ModelAdmin):
) )
#deactivated temporarily, they cause empty objects to be created in admin #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. # 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) return super(ObjectDBAdmin, self).get_form(request, obj, **defaults)
def save_model(self, request, obj, form, change): def save_model(self, request, obj, form, change):
obj.save()
if not change: if not change:
# adding a new object # adding a new object
obj = obj.typeclass obj = obj.typeclass

1
src/utils/idmapper/base.py
View file

@ -180,7 +180,6 @@ class SharedMemoryModel(Model):
super(SharedMemoryModel, cls).save(*args, **kwargs) super(SharedMemoryModel, cls).save(*args, **kwargs)
else: else:
# in another thread; make sure to save in reactor thread # in another thread; make sure to save in reactor thread
print "saving in another thread!"
def _save_callback(cls, *args, **kwargs): def _save_callback(cls, *args, **kwargs):
super(SharedMemoryModel, cls).save(*args, **kwargs) super(SharedMemoryModel, cls).save(*args, **kwargs)
#blockingCallFromThread(reactor, _save_callback, cls, *args, **kwargs) #blockingCallFromThread(reactor, _save_callback, cls, *args, **kwargs)