X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/73ce961f14509aabfa26536f847afd28111029c6..2ae6c6bc078cdc7ec6e3131bbbb430714bf36230:/apps/sponsors/models.py

diff --git a/apps/sponsors/models.py b/apps/sponsors/models.py
index 1e0d2e52d..2d18d1664 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
@@ -9,7 +10,7 @@ from django.utils.translation import ugettext_lazy as _
 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
 
 THUMB_WIDTH = 120
@@ -20,7 +21,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')
-    url = models.URLField(_('url'), blank=True, verify_exists=False)
+    url = models.URLField(_('url'), blank=True)
 
     def __unicode__(self):
         return self.name
@@ -34,14 +35,14 @@ class Sponsor(models.Model):
 
 class SponsorPage(models.Model):
     name = models.CharField(_('name'), max_length=120)
-    sponsors = JSONField(_('sponsors'), default={})
+    sponsors = JSONField(_('sponsors'), default='{}')
     _html = models.TextField(blank=True, editable=False)
     sprite = models.ImageField(upload_to='sponsorzy/sprite', blank=True)
 
     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']:
@@ -55,7 +56,7 @@ class SponsorPage(models.Model):
 
     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))
@@ -85,6 +86,9 @@ 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(),