X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/29a13b9e77d5a7ac5d26c95488028f88e6b57c2f..08433423130c027b64c87c13c1bb4d2390694263:/apps/catalogue/models/tag.py

diff --git a/apps/catalogue/models/tag.py b/apps/catalogue/models/tag.py
index f2ce27c45..ba219fc7c 100644
--- a/apps/catalogue/models/tag.py
+++ b/apps/catalogue/models/tag.py
@@ -26,7 +26,7 @@ TAG_CATEGORIES = (
 
 class Tag(TagBase):
     """A tag attachable to books and fragments (and possibly anything).
-    
+
     Used to represent searchable metadata (authors, epochs, genres, kinds),
     fragment themes (motifs) and some book hierarchy related kludges."""
     name = models.CharField(_('name'), max_length=50, db_index=True)
@@ -43,8 +43,8 @@ class Tag(TagBase):
     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)
-    changed_at    = models.DateTimeField(_('creation date'), auto_now=True, db_index=True)
+    created_at = models.DateTimeField(_('creation date'), auto_now_add=True, db_index=True)
+    changed_at = models.DateTimeField(_('creation date'), auto_now=True, db_index=True)
 
     class UrlDeprecationWarning(DeprecationWarning):
         pass
@@ -113,22 +113,22 @@ class Tag(TagBase):
                     objects = objects.exclude(pk__in=descendants_keys)
         return objects.count()
 
-    # I shouldn't break the get_count() api 
+    # 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 = 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:
             objects = Picture.tagged.with_all((self,)).order_by()
         return objects.count()
-        
+
     @staticmethod
     def get_tag_list(tags):
         if isinstance(tags, basestring):
@@ -146,7 +146,7 @@ class Tag(TagBase):
                 else:
                     try:
                         real_tags.append(Tag.objects.exclude(category='book').get(slug=name))
-                        deprecated = True 
+                        deprecated = True
                     except Tag.MultipleObjectsReturned, e:
                         ambiguous_slugs.append(name)
 
@@ -200,11 +200,8 @@ class Tag(TagBase):
                         tag.name = tag_name
                         setattr(tag, "name_%s" % lang, tag_name)
                         tag.sort_key = sortify(tag_sort_key.lower())
-                        try:
-                            tag.save()
-                        except Exception, e:
-                            import pdb; pdb.set_trace()
-                            raise e
+                        tag.save()
+
                     meta_tags.append(tag)
                 else:
                     # Ignore unknown tags in non-default languages.