X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/d606942f6eb286933eb71f4232db580fcb3a166c..5345c6e3640cc5f356b55348a5834e3a1987532d:/apps/sponsors/models.py diff --git a/apps/sponsors/models.py b/apps/sponsors/models.py index 4357d7863..3ca1a4894 100644 --- a/apps/sponsors/models.py +++ b/apps/sponsors/models.py @@ -9,11 +9,12 @@ 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 -THUMB_HEIGHT=120 +THUMB_WIDTH = 120 +THUMB_HEIGHT = 120 + class Sponsor(models.Model): name = models.CharField(_('name'), max_length=120) @@ -40,7 +41,7 @@ class SponsorPage(models.Model): 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']: @@ -54,10 +55,10 @@ 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)) + sprite = Image.new('RGBA', (THUMB_WIDTH, len(sponsors) * THUMB_HEIGHT)) for i, sponsor_id in enumerate(sponsor_ids): simg = Image.open(sponsors[sponsor_id].logo.path) if simg.size[0] > THUMB_WIDTH or simg.size[1] > THUMB_HEIGHT: