Only formalities.

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

diff --git a/src/sponsors/models.py b/src/sponsors/models.py
index 6e4ffe1..2fb4d89 100644 (file)
--- a/src/sponsors/models.py
+++ b/src/sponsors/models.py
@@ -1,12 +1,11 @@
-# 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 Wolne Lektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Wolne Lektury. See NOTICE for more information.

 #
 import json
 import time
 from io import BytesIO
 from django.core.cache import cache
 from django.db import models
 #
 import json
 import time
 from io import BytesIO
 from django.core.cache import cache
 from django.db import models

-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
 


@@ -17,10 +16,10 @@ THUMB_HEIGHT = 120
 
 
 class Sponsor(models.Model):
 
 
 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)
+    name = models.CharField('nazwa', max_length=120)
+    _description = models.CharField('opis', blank=True, max_length=255)
+    logo = models.ImageField('logo', upload_to='sponsorzy/sponsor/logo')
+    url = models.URLField('url', blank=True)

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


@@ -33,8 +32,8 @@ class Sponsor(models.Model):
 
 
 class SponsorPage(models.Model):
 
 
 class SponsorPage(models.Model):

-    name = models.CharField(_('name'), max_length=120)
-    sponsors = models.TextField(_('sponsors'), default='{}')
+    name = models.CharField('nazwa', max_length=120)
+    sponsors = models.TextField('sponsorzy', default='{}')

     _html = models.TextField(blank=True, editable=False)
     sprite = models.ImageField(upload_to='sponsorzy/sprite', blank=True)
 
     _html = models.TextField(blank=True, editable=False)
     sprite = models.ImageField(upload_to='sponsorzy/sprite', blank=True)
 


@@ -53,7 +52,8 @@ class SponsorPage(models.Model):
                     offset -= THUMB_HEIGHT
                 except KeyError:
                     pass
                     offset -= THUMB_HEIGHT
                 except KeyError:
                     pass

-            result.append(result_group)
+            if result_group['sponsors']:
+                result.append(result_group)

         return result
 
     def render_sprite(self):
         return result
 
     def render_sprite(self):


@@ -95,7 +95,7 @@ class SponsorPage(models.Model):
             'page': self
         })
         ret = super(SponsorPage, self).save(*args, **kwargs)
             'page': self
         })
         ret = super(SponsorPage, self).save(*args, **kwargs)

-        cache.delete('sponsor_page:' + name)
+        cache.delete('sponsor_page:' + self.name)

         return ret
 
     def __str__(self):
         return ret
 
     def __str__(self):