phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'feature/advertisement-br' into 'develop'

Browse Source 
Added mobile method

See merge request gm/gm-backend!238
This commit is contained in:
Олег Хаятов 2020-01-23 18:13:35 +00:00
commit e8c043d2ed
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/advertisement/models.py
View File

@ -45,10 +45,8 @@ class Advertisement(ProjectBaseMixin):
url = models.URLField(verbose_name=_('Ad URL')) url = models.URLField(verbose_name=_('Ad URL'))
block_level = models.CharField(verbose_name=_('Block level'), max_length=10, blank=True, null=True) block_level = models.CharField(verbose_name=_('Block level'), max_length=10, blank=True, null=True)
target_languages = models.ManyToManyField(Language) target_languages = models.ManyToManyField(Language)
start = models.DateTimeField(null=True, start = models.DateTimeField(null=True, verbose_name=_('start'))
verbose_name=_('start')) end = models.DateTimeField(blank=True, null=True, default=None, verbose_name=_('end'))
end = models.DateTimeField(blank=True, null=True, default=None,
verbose_name=_('end'))
sites = models.ManyToManyField('main.SiteSettings', sites = models.ManyToManyField('main.SiteSettings',
related_name='advertisements', related_name='advertisements',
verbose_name=_('site')) verbose_name=_('site'))

1
apps/advertisement/urls/mobile.py
View File

@ -8,6 +8,7 @@ from .common import common_urlpatterns
app_name = 'advertisements' app_name = 'advertisements'
urlpatterns = [ urlpatterns = [
path('', views.AdvertisementPageTypeMobileListView.as_view(), name='list'),
path('<page_type>/', views.AdvertisementPageTypeMobileListView.as_view(), name='list'), path('<page_type>/', views.AdvertisementPageTypeMobileListView.as_view(), name='list'),
] ]

4
apps/advertisement/views/common.py
View File

@ -24,6 +24,10 @@ class AdvertisementPageTypeListView(AdvertisementBaseView, generics.ListAPIView)
def get_queryset(self): def get_queryset(self):
"""Overridden get queryset method.""" """Overridden get queryset method."""
product_type = self.kwargs.get('page_type') product_type = self.kwargs.get('page_type')
if product_type is None:
product_type = 'mobile'
qs = super(AdvertisementPageTypeListView, self).get_queryset() qs = super(AdvertisementPageTypeListView, self).get_queryset()
if product_type: if product_type:
return qs.by_page_type(product_type) \ return qs.by_page_type(product_type) \

1
apps/advertisement/views/mobile.py
View File

@ -16,4 +16,3 @@ class AdvertisementPageTypeMobileListView(AdvertisementPageTypeListView):
qs = super().get_queryset().exclude(frequency_percentage__lte=percentage) qs = super().get_queryset().exclude(frequency_percentage__lte=percentage)
qs.update(views_count=F('views_count') + 1) qs.update(views_count=F('views_count') + 1)
return qs return qs