Minor Django version bump.

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

diff --git a/src/annoy/models.py b/src/annoy/models.py
index 600fe5f..488fa87 100644 (file)
--- a/src/annoy/models.py
+++ b/src/annoy/models.py
@@ -1,6 +1,7 @@
 from django.apps import apps
 from django.conf import settings
 from django.db import models
 from django.apps import apps
 from django.conf import settings
 from django.db import models

+from django.template import Context, Template

 from django.utils.translation import ugettext_lazy as _
 from django.utils.timezone import now
 from .places import PLACES, PLACE_CHOICES
 from django.utils.translation import ugettext_lazy as _
 from django.utils.timezone import now
 from .places import PLACES, PLACE_CHOICES


@@ -16,6 +17,7 @@ class Banner(models.Model):
     open_label = models.CharField(_('open label'), max_length=255, blank=True)
     close_label = models.CharField(_('close label'), max_length=255, blank=True)
     text = models.TextField(_('text'))
     open_label = models.CharField(_('open label'), max_length=255, blank=True)
     close_label = models.CharField(_('close label'), max_length=255, blank=True)
     text = models.TextField(_('text'))

+    image = models.FileField(_('image'), upload_to='annoy/banners/', blank=True)

     url = models.CharField(_('url'), max_length=1024)
     priority = models.PositiveSmallIntegerField(
         _('priority'), default=0,
     url = models.CharField(_('url'), max_length=1024)
     priority = models.PositiveSmallIntegerField(
         _('priority'), default=0,


@@ -33,15 +35,18 @@ class Banner(models.Model):
     def __str__(self):
         return self.text
 
     def __str__(self):
         return self.text
 

+    def get_text(self):
+        return Template(self.text).render(Context())
+

     @classmethod
     def choice(cls, place, request):
         Membership = apps.get_model('club', 'Membership')
 
         if hasattr(request, 'annoy_banner_exempt'):
             return cls.objects.none()
     @classmethod
     def choice(cls, place, request):
         Membership = apps.get_model('club', 'Membership')
 
         if hasattr(request, 'annoy_banner_exempt'):
             return cls.objects.none()

-        
+

         if settings.DEBUG:
         if settings.DEBUG:

-            assert place in PLACES, "Banner place `{}` must be defined in annoy.places.".format(place)
+            assert place in PLACES, f"Banner place `{place}` must be defined in annoy.places."

 
         n = now()
         banners = cls.objects.filter(
 
         n = now()
         banners = cls.objects.filter(


@@ -59,8 +64,8 @@ class Banner(models.Model):
             if Membership.is_active_for(request.user):
                 banners = banners.filter(show_members=True)
         return banners
             if Membership.is_active_for(request.user):
                 banners = banners.filter(show_members=True)
         return banners

-        
-        
+
+

 class DynamicTextInsert(models.Model):
     paragraphs = models.IntegerField(_('pararaphs'))
     url = models.CharField(max_length=1024)
 class DynamicTextInsert(models.Model):
     paragraphs = models.IntegerField(_('pararaphs'))
     url = models.CharField(max_length=1024)


@@ -73,13 +78,22 @@ class DynamicTextInsert(models.Model):
     def __str__(self):
         return str(self.paragraphs)
 
     def __str__(self):
         return str(self.paragraphs)
 

+    @classmethod
+    def get_all(cls, request):
+        Membership = apps.get_model('club', 'Membership')
+        if Membership.is_active_for(request.user) and not request.user.is_staff:
+            return cls.objects.none()
+        return cls.objects.all()
+
+

     def choose(self):
         return self.dynamictextinserttext_set.order_by('?').first()
 
 
 class DynamicTextInsertText(models.Model):
     insert = models.ForeignKey(DynamicTextInsert, models.CASCADE)
     def choose(self):
         return self.dynamictextinserttext_set.order_by('?').first()
 
 
 class DynamicTextInsertText(models.Model):
     insert = models.ForeignKey(DynamicTextInsert, models.CASCADE)

+    own_colors = models.BooleanField(default=False)

     background_color = models.CharField(max_length=10, blank=True)
     text_color = models.CharField(max_length=10, blank=True)
     text = models.TextField(_('text'))
     background_color = models.CharField(max_length=10, blank=True)
     text_color = models.CharField(max_length=10, blank=True)
     text = models.TextField(_('text'))

-    image = models.FileField(blank=True)
+    image = models.FileField(blank=True, upload_to='annoy/inserts/')