Remove machina, remove default cache config, add some upgrades and compatibility...

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

diff --git a/src/picture/models.py b/src/picture/models.py
index 875ebcc..5f5fe4c 100644 (file)
--- a/src/picture/models.py
+++ b/src/picture/models.py
@@ -22,7 +22,7 @@ import re
 
 from PIL import Image
 
 
 from PIL import Image
 

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 from newtagging import managers
 from os import path
 
 from newtagging import managers
 from os import path
 


@@ -101,6 +101,8 @@ class Picture(models.Model):
 
     short_html_url_name = 'picture_short'
 
 
     short_html_url_name = 'picture_short'
 

+    is_picture = True
+

     class AlreadyExists(Exception):
         pass
 
     class AlreadyExists(Exception):
         pass
 


@@ -110,6 +112,9 @@ class Picture(models.Model):
         verbose_name = _('picture')
         verbose_name_plural = _('pictures')
 
         verbose_name = _('picture')
         verbose_name_plural = _('pictures')
 

+    def get_extra_info_json(self):
+        return json.loads(self.extra_info or '{}')
+

     def save(self, force_insert=False, force_update=False, **kwargs):
         from sortify import sortify
 
     def save(self, force_insert=False, force_update=False, **kwargs):
         from sortify import sortify