image listings / boxes work but need polishing. started coding the viewer.

[wolnelektury.git] / apps / picture / models.py

diff --git a/apps/picture/models.py b/apps/picture/models.py
index dd6ae8e..dc92c43 100644 (file)
--- a/apps/picture/models.py
+++ b/apps/picture/models.py
@@ -9,7 +9,7 @@ from django.template.loader import render_to_string
 from django.core.cache import get_cache
 from catalogue.utils import split_tags
 from django.utils.safestring import mark_safe
 from django.core.cache import get_cache
 from catalogue.utils import split_tags
 from django.utils.safestring import mark_safe

-from slughifi import slughifi
+from fnpdjango.utils.text.slughifi import slughifi

 
 from django.utils.translation import ugettext_lazy as _
 from newtagging import managers
 
 from django.utils.translation import ugettext_lazy as _
 from newtagging import managers


@@ -184,7 +184,7 @@ class Picture(models.Model):
         if short_html is not None:
             return mark_safe(short_html)
         else:
         if short_html is not None:
             return mark_safe(short_html)
         else:

-            tags = self.tags.filter(category__in=('author', 'kind', 'epoch'))
+            tags = self.tags.filter(category__in=('author', 'kind', 'epoch', 'genre'))

             tags = split_tags(tags)
 
             short_html = unicode(render_to_string('picture/picture_short.html',
             tags = split_tags(tags)
 
             short_html = unicode(render_to_string('picture/picture_short.html',