X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/3726f9b225fb5c39cbf067f53d4cf6f7d8a9f326..40b28c6172db2f68bd9199024bb4e27e6741ded4:/apps/catalogue/models/tag.py

diff --git a/apps/catalogue/models/tag.py b/apps/catalogue/models/tag.py
index 7280060a6..acfb9d8f3 100644
--- a/apps/catalogue/models/tag.py
+++ b/apps/catalogue/models/tag.py
@@ -40,6 +40,7 @@ class Tag(TagBase):
     book_count = models.IntegerField(_('book count'), blank=True, null=True)
     picture_count = models.IntegerField(_('picture count'), blank=True, null=True)
     gazeta_link = models.CharField(blank=True, max_length=240)
+    culturepl_link = models.CharField(blank=True, max_length=240)
     wiki_link = models.CharField(blank=True, max_length=240)
 
     created_at    = models.DateTimeField(_('creation date'), auto_now_add=True, db_index=True)
@@ -115,13 +116,13 @@ class Tag(TagBase):
     # I shouldn't break the get_count() api 
     # just to include pictures.
     def get_picture_count(self):
-        from picture.models import Picture
+        from picture.models import Picture, PictureArea
         
         if self.category == 'book':
             # never used
-            objects = Book.objects.none()
+            objects = Picture.objects.none()
         elif self.category == 'theme':
-            objects = Picture.tagged.with_all((self,))
+            objects = PictureArea.tagged.with_all((self,))
         elif self.category == 'thing':
             objects = Picture.tagged.with_all((self,))
         else:
@@ -195,10 +196,12 @@ class Tag(TagBase):
                     # Allow creating new tag, if it's in default language.
                     tag, created = Tag.objects.get_or_create(slug=slughifi(tag_name), category=category)
                     if created:
+                        tag_name = unicode(tag_name)
                         tag.name = tag_name
                         setattr(tag, "name_%s" % lang, tag_name)
                         tag.sort_key = sortify(tag_sort_key.lower())
                         tag.save()
+
                     meta_tags.append(tag)
                 else:
                     # Ignore unknown tags in non-default languages.