X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/c3bcc0703d6255b78c2a6813bbea03e9581609e0..519e5664528bc9dd8cc7ff034fb9c2148a6db063:/apps/catalogue/models/chunk.py?ds=inline diff --git a/apps/catalogue/models/chunk.py b/apps/catalogue/models/chunk.py index 9b1dcbae..fc3a9eae 100755 --- a/apps/catalogue/models/chunk.py +++ b/apps/catalogue/models/chunk.py @@ -11,7 +11,6 @@ from django.utils.translation import ugettext_lazy as _ from catalogue.helpers import cached_in_field from catalogue.managers import VisibleManager from catalogue.tasks import refresh_instance -from catalogue.xml_tools import GradedText from dvcs import models as dvcs_models @@ -23,7 +22,7 @@ class Chunk(dvcs_models.Document): number = models.IntegerField(_('number')) title = models.CharField(_('title'), max_length=255, blank=True) slug = models.SlugField(_('slug')) - gallery_start = models.IntegerField(_('gallery start'), null=True, blank=True) + gallery_start = models.IntegerField(_('gallery start'), null=True, blank=True, default=1) # cache _short_html = models.TextField(null=True, blank=True, editable=False) @@ -50,7 +49,7 @@ class Chunk(dvcs_models.Document): @models.permalink def get_absolute_url(self): - return ("wiki_editor", [self.book.slug, self.slug]) + return "wiki_editor", [self.book.slug, self.slug] def pretty_name(self, book_length=None): title = self.book.title @@ -60,7 +59,6 @@ class Chunk(dvcs_models.Document): title += " (%d/%d)" % (self.number, book_length) return title - # Creating and manipulation # ========================= @@ -72,7 +70,8 @@ class Chunk(dvcs_models.Document): while not new_chunk: new_slug = self.book.make_chunk_slug(slug) try: - new_chunk = self.book.chunk_set.create(number=self.number+1, + new_chunk = self.book.chunk_set.create( + number=self.number+1, slug=new_slug[:50], title=title[:255], **kwargs) except IntegrityError: pass @@ -85,7 +84,6 @@ class Chunk(dvcs_models.Document): else: return cls.objects.get(book__slug=book_slug, slug=chunk_slug) - # State & cache # ============= @@ -93,7 +91,7 @@ class Chunk(dvcs_models.Document): change = self.publishable() if not change: return False - return change.publish_log.exists() + return not change.publish_log.exists() def is_changed(self): if self.head is None: @@ -124,6 +122,3 @@ class Chunk(dvcs_models.Document): self.changed self.hidden self.short_html - - def graded(self, master=None): - return GradedText(self.materialize(), master)