X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/e9f8a9269b64a5af7c95d6c2714b1ae97e68d6a1..26f3ed051ee8f2c5caa7a3119bcf30e5310d5266:/apps/sponsors/models.py diff --git a/apps/sponsors/models.py b/apps/sponsors/models.py index 24d302208..0565b9744 100644 --- 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. # +import json import time from StringIO import StringIO from django.db import models @@ -11,6 +12,7 @@ from PIL import Image from jsonfield import JSONField from django.core.files.base import ContentFile +from ssify import flush_ssi_includes THUMB_WIDTH = 120 THUMB_HEIGHT = 120 @@ -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 = ( - 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]) @@ -85,12 +87,20 @@ class SponsorPage(models.Model): 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 }) - 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