Added extra_info field to Book model.

[wolnelektury.git] / apps / catalogue / fields.py

diff --git a/apps/catalogue/fields.py b/apps/catalogue/fields.py
index 55b38cc..a75752e 100644 (file)
--- a/apps/catalogue/fields.py
+++ b/apps/catalogue/fields.py
@@ -45,7 +45,7 @@ class JSONField(models.TextField):
 
     def contribute_to_class(self, cls, name):
         super(JSONField, self).contribute_to_class(cls, name)
 
     def contribute_to_class(self, cls, name):
         super(JSONField, self).contribute_to_class(cls, name)

-        dispatcher.connect(self.post_init, signal=signals.post_init, sender=cls)
+        signals.post_init.connect(self.post_init, sender=cls)

 
         def get_json(model_instance):
             return dumps(getattr(model_instance, self.attname, None))
 
         def get_json(model_instance):
             return dumps(getattr(model_instance, self.attname, None))


@@ -55,7 +55,8 @@ class JSONField(models.TextField):
             return setattr(model_instance, self.attname, loads(json))
         setattr(cls, 'set_%s_json' % self.name, set_json)
 
             return setattr(model_instance, self.attname, loads(json))
         setattr(cls, 'set_%s_json' % self.name, set_json)
 

-    def post_init(self, instance=None):
+    def post_init(self, **kwargs):
+        instance = kwargs.get('instance', None)

         value = self.value_from_object(instance)
         if (value):
             setattr(instance, self.attname, loads(value))
         value = self.value_from_object(instance)
         if (value):
             setattr(instance, self.attname, loads(value))