X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/13042ddcb4ad5af860cff616d2a69d4f05dac5d8..a7d1e3cd75cd56c3f9a5ddceb63196aad9d1db65:/src/annoy/models.py?ds=inline diff --git a/src/annoy/models.py b/src/annoy/models.py index 4df3a5e37..5a613f1e0 100644 --- a/src/annoy/models.py +++ b/src/annoy/models.py @@ -14,6 +14,9 @@ class Banner(models.Model): choices=STYLES, help_text=_('Affects blackout.') ) + smallfont = models.BooleanField(_('small font'), default=False) + text_color = models.CharField(max_length=10, blank=True) + background_color = models.CharField(max_length=10, blank=True) action_label = models.CharField( _('action label'), max_length=255, blank=True, @@ -31,6 +34,7 @@ class Banner(models.Model): until = models.DateTimeField(_('until'), null=True, blank=True) show_members = models.BooleanField(_('show members'), default=False) staff_preview = models.BooleanField(_('staff preview'), default=False) + only_authenticated = models.BooleanField(_('only for authenticated users'), default=False) class Meta: verbose_name = _('banner') @@ -62,12 +66,15 @@ class Banner(models.Model): until__lt=n ).order_by('-priority', '?') + if not request.user.is_authenticated: + banners = banners.filter(only_authenticated=False) + if not request.user.is_staff: banners = banners.filter(staff_preview=False) - if request: - if Membership.is_active_for(request.user): - banners = banners.filter(show_members=True) + if Membership.is_active_for(request.user): + banners = banners.filter(show_members=True) + return banners