X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/0242f6b40865679bb86cac65e42fc3889155a0f0..87c18bbe4e7fafbc89442c15e49d4099182c7567:/apps/catalogue/models.py diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py index 60d278580..81965cec2 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) @@ -97,6 +99,7 @@ class Book(models.Model): objects = models.Manager() tagged = managers.ModelTaggedItemManager(Tag) tags = managers.TagDescriptor(Tag) + @property def name(self): @@ -167,6 +170,7 @@ class Book(models.Model): book_shelves = list(book.tags.filter(category='set')) book.title = book_info.title + book.extra_info = book_info.to_dict() book._short_html = '' book.save()