Enable jsmin.

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

diff --git a/apps/sponsors/models.py b/apps/sponsors/models.py
index 1e0d2e5..0565b97 100644 (file)
--- a/apps/sponsors/models.py
+++ b/apps/sponsors/models.py
@@ -2,6 +2,7 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

+import json

 import time
 from StringIO import StringIO
 from django.db import models
 import time
 from StringIO import StringIO
 from django.db import models


@@ -9,8 +10,9 @@ from django.utils.translation import ugettext_lazy as _
 from django.template.loader import render_to_string
 from PIL import Image
 
 from django.template.loader import render_to_string
 from PIL import Image
 

-from sponsors.fields import JSONField
+from jsonfield import JSONField

 from django.core.files.base import ContentFile
 from django.core.files.base import ContentFile

+from ssify import flush_ssi_includes

 
 THUMB_WIDTH = 120
 THUMB_HEIGHT = 120
 
 THUMB_WIDTH = 120
 THUMB_HEIGHT = 120


@@ -20,7 +22,7 @@ class Sponsor(models.Model):
     name = models.CharField(_('name'), max_length=120)
     _description = models.CharField(_('description'), blank=True, max_length=255)
     logo = models.ImageField(_('logo'), upload_to='sponsorzy/sponsor/logo')
     name = models.CharField(_('name'), max_length=120)
     _description = models.CharField(_('description'), blank=True, max_length=255)
     logo = models.ImageField(_('logo'), upload_to='sponsorzy/sponsor/logo')

-    url = models.URLField(_('url'), blank=True, verify_exists=False)
+    url = models.URLField(_('url'), blank=True)

 
     def __unicode__(self):
         return self.name
 
     def __unicode__(self):
         return self.name


@@ -41,7 +43,7 @@ class SponsorPage(models.Model):
     def populated_sponsors(self):
         result = []
         offset = 0
     def populated_sponsors(self):
         result = []
         offset = 0

-        for column in self.get_sponsors_value():
+        for column in self.sponsors:

             result_group = {'name': column['name'], 'sponsors': []}
             sponsor_objects = Sponsor.objects.in_bulk(column['sponsors'])
             for sponsor_pk in column['sponsors']:
             result_group = {'name': column['name'], 'sponsors': []}
             sponsor_objects = Sponsor.objects.in_bulk(column['sponsors'])
             for sponsor_pk in column['sponsors']:


@@ -55,7 +57,7 @@ class SponsorPage(models.Model):
 
     def render_sprite(self):
         sponsor_ids = []
 
     def render_sprite(self):
         sponsor_ids = []

-        for column in self.get_sponsors_value():
+        for column in self.sponsors:

             sponsor_ids.extend(column['sponsors'])
         sponsors = Sponsor.objects.in_bulk(sponsor_ids)
         sprite = Image.new('RGBA', (THUMB_WIDTH, len(sponsors) * THUMB_HEIGHT))
             sponsor_ids.extend(column['sponsors'])
         sponsors = Sponsor.objects.in_bulk(sponsor_ids)
         sprite = Image.new('RGBA', (THUMB_WIDTH, len(sponsors) * THUMB_HEIGHT))


@@ -63,7 +65,7 @@ class SponsorPage(models.Model):
             simg = Image.open(sponsors[sponsor_id].logo.path)
             if simg.size[0] > THUMB_WIDTH or simg.size[1] > THUMB_HEIGHT:
                 size = (
             simg = Image.open(sponsors[sponsor_id].logo.path)
             if simg.size[0] > THUMB_WIDTH or simg.size[1] > THUMB_HEIGHT:
                 size = (

-                    min(THUMB_WIDTH, 
+                    min(THUMB_WIDTH,

                         simg.size[0] * THUMB_HEIGHT / simg.size[1]),
                     min(THUMB_HEIGHT,
                         simg.size[1] * THUMB_WIDTH / simg.size[0])
                         simg.size[0] * THUMB_HEIGHT / simg.size[1]),
                     min(THUMB_HEIGHT,
                         simg.size[1] * THUMB_WIDTH / simg.size[0])


@@ -85,12 +87,20 @@ class SponsorPage(models.Model):
     html = property(fget=html)
 
     def save(self, *args, **kwargs):
     html = property(fget=html)
 
     def save(self, *args, **kwargs):

+        if isinstance(self.sponsors, basestring):
+            # Walkaround for weird jsonfield 'no-decode' optimization.
+            self.sponsors = json.loads(self.sponsors)

         self.render_sprite()
         self._html = render_to_string('sponsors/page.html', {
             'sponsors': self.populated_sponsors(),
             'page': self
         })
         self.render_sprite()
         self._html = render_to_string('sponsors/page.html', {
             'sponsors': self.populated_sponsors(),
             'page': self
         })

-        return super(SponsorPage, self).save(*args, **kwargs)
+        ret = super(SponsorPage, self).save(*args, **kwargs)
+        self.flush_includes()
+        return ret
+
+    def flush_includes(self):
+        flush_ssi_includes(['/sponsors/page/%s.html' % self.name])

 
     def __unicode__(self):
         return self.name
 
     def __unicode__(self):
         return self.name