Fix error with revision check during saving.

[redakcja.git] / src / catalogue / models.py

diff --git a/src/catalogue/models.py b/src/catalogue/models.py
index 9768057..be7c37f 100644 (file)
--- a/src/catalogue/models.py
+++ b/src/catalogue/models.py
@@ -198,6 +198,9 @@ class NotableBook(OrderableModel):
     author = models.ForeignKey(Author, models.CASCADE)
     book = models.ForeignKey('Book', models.CASCADE)
 
     author = models.ForeignKey(Author, models.CASCADE)
     book = models.ForeignKey('Book', models.CASCADE)
 

+    def __str__(self):
+        return self.book.title
+

 
 class Category(WikidataModel):
     name = models.CharField(_("name"), max_length=255)
 
 class Category(WikidataModel):
     name = models.CharField(_("name"), max_length=255)


@@ -227,6 +230,10 @@ class Epoch(Category):
 
 
 class Genre(Category):
 
 
 class Genre(Category):

+    thema = models.CharField(
+        max_length=32, blank=True,
+        help_text='Odpowiadający kwalifikator Thema.'
+    )

     plural = models.CharField(
         'liczba mnoga', max_length=255, blank=True,
     )
     plural = models.CharField(
         'liczba mnoga', max_length=255, blank=True,
     )


@@ -279,6 +286,7 @@ class Book(WikidataModel):
     )
     original_year = models.IntegerField(_('original publication year'), null=True, blank=True)
     pd_year = models.IntegerField(_('year of entry into PD'), null=True, blank=True)
     )
     original_year = models.IntegerField(_('original publication year'), null=True, blank=True)
     pd_year = models.IntegerField(_('year of entry into PD'), null=True, blank=True)

+    plwiki = models.CharField(blank=True, max_length=255)

     gazeta_link = models.CharField(_("gazeta link"), max_length=255, blank=True)
     collections = models.ManyToManyField("Collection", blank=True, verbose_name=_("collections"))
 
     gazeta_link = models.CharField(_("gazeta link"), max_length=255, blank=True)
     collections = models.ManyToManyField("Collection", blank=True, verbose_name=_("collections"))
 


@@ -298,6 +306,7 @@ class Book(WikidataModel):
         verbose_name_plural = _('books')
 
     class Wikidata:
         verbose_name_plural = _('books')
 
     class Wikidata:

+        plwiki = "plwiki"

         authors = WIKIDATA.AUTHOR
         translators = WIKIDATA.TRANSLATOR
         title = WIKIDATA.TITLE
         authors = WIKIDATA.AUTHOR
         translators = WIKIDATA.TRANSLATOR
         title = WIKIDATA.TITLE


@@ -375,11 +384,8 @@ class Book(WikidataModel):
             for work_type in WorkType.objects.all()
         }
 
             for work_type in WorkType.objects.all()
         }
 

-    def scans_gallery(self):
-        bs = self.booksource_set.first()
-        if bs is None:
-            return ''
-        return bs.pk
+    def scans_galleries(self):
+        return [bs.pk for bs in self.booksource_set.all()]

 
     def is_published(self):
         return any(b.is_published() for b in self.document_books.all())
 
     def is_published(self):
         return any(b.is_published() for b in self.document_books.all())


@@ -420,6 +426,15 @@ class Book(WikidataModel):
         self._content_stats = stats
         return stats
 
         self._content_stats = stats
         return stats
 

+    @property
+    def are_sources_ready(self):
+        if not self.booksource_set.exists():
+            return False
+        for bs in self.booksource_set.all():
+            if not bs.source.has_view_files() or not bs.source.has_ocr_files() or bs.source.modified_at > bs.source.processed_at:
+                return False
+        return True
+

     chars = lambda self: self.content_stats.get('chars', '')
     chars_with_fn = lambda self: self.content_stats.get('chars_with_fn', '')
     words = lambda self: self.content_stats.get('words', '')
     chars = lambda self: self.content_stats.get('chars', '')
     chars_with_fn = lambda self: self.content_stats.get('chars_with_fn', '')
     words = lambda self: self.content_stats.get('words', '')


@@ -588,7 +603,12 @@ class BookMonthlyStats(models.Model):
 
 
 class Thema(models.Model):
 
 
 class Thema(models.Model):

-    code = models.CharField(max_length=128, unique=True)
+    code = models.CharField(
+        max_length=128, unique=True,
+        help_text='Używamy rozszerzenia <code>.WL-</code> do oznaczania własnych kodów.<br> '
+        'Przykładowo, w przypadku potrzeby stworzenia nowej kategorii „insurekcja kościuszkowska”, '
+        'można by ją utworzyć jako 3MLQ‑PL‑A.WL-A, czyli w ramach już istniejącej wyższej kategorii 3MLQ‑PL‑A „rozbiory Polski”.',
+    )

     name = models.CharField(max_length=1024)
     slug = models.SlugField(
         max_length=255, null=True, blank=True, unique=True,
     name = models.CharField(max_length=1024)
     slug = models.SlugField(
         max_length=255, null=True, blank=True, unique=True,