X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/c8d364d4d3331d03a079d200887e5462279fd875..ec546ced288878c12c9977f7b2218f76c34d352f:/src/annoy/models.py diff --git a/src/annoy/models.py b/src/annoy/models.py index 55bb2ac38..c8fdf2dad 100644 --- a/src/annoy/models.py +++ b/src/annoy/models.py @@ -2,7 +2,7 @@ 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.translation import gettext_lazy as _ from django.utils.timezone import now from .places import PLACES, PLACE_CHOICES, STYLES @@ -34,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') @@ -65,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