From cc66b8d67b345b06b64b0f5de646baf09b8fbcd8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20St=C4=99pniowski?= Date: Thu, 9 Oct 2008 12:34:26 +0200 Subject: [PATCH 1/1] Added extra_info field to Book model. --- apps/catalogue/fields.py | 5 +++-- apps/catalogue/models.py | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/catalogue/fields.py b/apps/catalogue/fields.py index 55b38cc0a..a75752e67 100644 --- 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) - 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)) @@ -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) - 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)) diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py index 61e78a00f..2022f1c86 100644 --- a/apps/catalogue/models.py +++ b/apps/catalogue/models.py @@ -10,6 +10,7 @@ from django.core.urlresolvers import reverse from newtagging.models import TagBase from newtagging import managers +from catalogue.fields import JSONField from librarian import html, dcparser @@ -41,7 +42,7 @@ class Tag(TagBase): db_index=True, choices=TAG_CATEGORIES) description = models.TextField(_('description'), blank=True) main_page = models.BooleanField(_('main page'), default=False, db_index=True, help_text=_('Show tag on main page')) - + user = models.ForeignKey(User, blank=True, null=True) book_count = models.IntegerField(_('book count'), default=0, blank=False, null=False) @@ -84,6 +85,7 @@ class Book(models.Model): created_at = models.DateTimeField(_('creation date'), auto_now=True) _short_html = models.TextField(_('short HTML'), editable=False) parent_number = models.IntegerField(_('parent number'), default=0) + extra_info = JSONField(_('extra information')) # Formats xml_file = models.FileField(_('XML file'), upload_to=book_upload_path('xml'), blank=True) -- 2.20.1