diff --git a/apps/advertisement/models.py b/apps/advertisement/models.py index 5d335176..81b5dbb2 100644 --- a/apps/advertisement/models.py +++ b/apps/advertisement/models.py @@ -45,10 +45,8 @@ class Advertisement(ProjectBaseMixin): url = models.URLField(verbose_name=_('Ad URL')) block_level = models.CharField(verbose_name=_('Block level'), max_length=10, blank=True, null=True) target_languages = models.ManyToManyField(Language) - start = models.DateTimeField(null=True, - verbose_name=_('start')) - end = models.DateTimeField(blank=True, null=True, default=None, - verbose_name=_('end')) + start = models.DateTimeField(null=True, verbose_name=_('start')) + end = models.DateTimeField(blank=True, null=True, default=None, verbose_name=_('end')) sites = models.ManyToManyField('main.SiteSettings', related_name='advertisements', verbose_name=_('site')) diff --git a/apps/advertisement/urls/mobile.py b/apps/advertisement/urls/mobile.py index f61003da..350aecd3 100644 --- a/apps/advertisement/urls/mobile.py +++ b/apps/advertisement/urls/mobile.py @@ -8,6 +8,7 @@ from .common import common_urlpatterns app_name = 'advertisements' urlpatterns = [ + path('', views.AdvertisementPageTypeMobileListView.as_view(), name='list'), path('/', views.AdvertisementPageTypeMobileListView.as_view(), name='list'), ] diff --git a/apps/advertisement/views/common.py b/apps/advertisement/views/common.py index 12702d4b..08f739ef 100644 --- a/apps/advertisement/views/common.py +++ b/apps/advertisement/views/common.py @@ -24,6 +24,10 @@ class AdvertisementPageTypeListView(AdvertisementBaseView, generics.ListAPIView) def get_queryset(self): """Overridden get queryset method.""" product_type = self.kwargs.get('page_type') + + if product_type is None: + product_type = 'mobile' + qs = super(AdvertisementPageTypeListView, self).get_queryset() if product_type: return qs.by_page_type(product_type) \ diff --git a/apps/advertisement/views/mobile.py b/apps/advertisement/views/mobile.py index 7ae2f688..6fdb95bd 100644 --- a/apps/advertisement/views/mobile.py +++ b/apps/advertisement/views/mobile.py @@ -16,4 +16,3 @@ class AdvertisementPageTypeMobileListView(AdvertisementPageTypeListView): qs = super().get_queryset().exclude(frequency_percentage__lte=percentage) qs.update(views_count=F('views_count') + 1) return qs -