X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/c600b1bd8a8a631ce2972b0efc3a1a6014b56f40..db06ae78aac8e159e731524fc8588e7ad6945e20:/apps/catalogue/models/book.py diff --git a/apps/catalogue/models/book.py b/apps/catalogue/models/book.py index f07c9a83..34ac796c 100755 --- a/apps/catalogue/models/book.py +++ b/apps/catalogue/models/book.py @@ -3,6 +3,7 @@ # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # +from django.contrib.auth.models import User from django.contrib.sites.models import Site from django.db import models, transaction from django.template.loader import render_to_string @@ -10,7 +11,6 @@ from django.utils.translation import ugettext_lazy as _ from django.conf import settings from slughifi import slughifi - import apiclient from catalogue.helpers import cached_in_field, GalleryMerger from catalogue.models import BookPublishRecord, ChunkPublishRecord, Project @@ -18,10 +18,12 @@ from catalogue.signals import post_publish from catalogue.tasks import refresh_instance, book_content_updated from catalogue.xml_tools import compile_text, split_xml from cover.models import Image +from organizations.models import Organization import os import shutil import re + class Book(models.Model): """ A document edited on the wiki """ @@ -31,6 +33,9 @@ class Book(models.Model): gallery = models.CharField(u'materiały', max_length=255, blank=True) project = models.ForeignKey(Project, null=True, blank=True) + owner_user = models.ForeignKey(User, null=True) + owner_organization = models.ForeignKey(Organization, null=True) + #wl_slug = models.CharField(_('title'), max_length=255, null=True, db_index=True, editable=False) parent = models.ForeignKey('self', null=True, blank=True, verbose_name=_('parent'), related_name="children", editable=False) parent_number = models.IntegerField(_('parent number'), null=True, blank=True, db_index=True, editable=False) @@ -320,7 +325,7 @@ class Book(models.Model): return len(self) == 1 single = cached_in_field('_single')(is_single) - @cached_in_field('_short_html') + #@cached_in_field('_short_html') def short_html(self): return render_to_string('catalogue/book_list/book.html', {'book': self})