fixes

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

diff --git a/src/social/models.py b/src/social/models.py
index 4c8cd74..d46dc08 100644 (file)
--- a/src/social/models.py
+++ b/src/social/models.py
@@ -6,7 +6,7 @@ from django.db import models
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _, get_language
+from django.utils.translation import gettext_lazy as _, get_language
 from catalogue.models import Book
 from wolnelektury.utils import cached_render, clear_cached_renders
 
@@ -125,6 +125,7 @@ class Cite(models.Model):
 class Carousel(models.Model):
     placement = models.SlugField(_('placement'), choices=[
         ('main', 'main'),
+        ('main_2022', 'main 2022'),
     ])
     priority = models.SmallIntegerField(_('priority'), default=0)
     language = models.CharField(_('language'), max_length=2, blank=True, default='', choices=settings.LANGUAGES)
@@ -139,21 +140,20 @@ class Carousel(models.Model):
 
     @classmethod
     def get(cls, placement):
-        carousel = cls.objects.filter(models.Q(language='') | models.Q(language=get_language()), placement=placement).order_by('-priority', '?').first()
+        carousel = cls.objects.filter(placement=placement).order_by('-priority', '?').first()
         if carousel is None:
             carousel = cls.objects.create(placement=placement)
         return carousel
 
 
 class CarouselItem(models.Model):
-    order = models.PositiveSmallIntegerField(_('order'), unique=True)
+    order = models.PositiveSmallIntegerField(_('order'))
     carousel = models.ForeignKey(Carousel, models.CASCADE, verbose_name=_('carousel'))
     banner = models.ForeignKey(Cite, models.CASCADE, null=True, blank=True, verbose_name=_('banner'))
     banner_group = models.ForeignKey(BannerGroup, models.CASCADE, null=True, blank=True, verbose_name=_('banner group'))
 
     class Meta:
         ordering = ('order',)
-        unique_together = [('carousel', 'order')]
         verbose_name = _('carousel item')
         verbose_name_plural = _('carousel items')