From 4f67c295d164456136a5e5b42228809e58b3ee45 Mon Sep 17 00:00:00 2001 From: evgeniy-st Date: Sat, 2 Nov 2019 12:11:03 +0300 Subject: [PATCH] Carousel link --- apps/main/models.py | 3 +++ apps/main/serializers.py | 2 ++ apps/main/urls/common.py | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/main/models.py b/apps/main/models.py index 59a3ca12..5f3a4dcf 100644 --- a/apps/main/models.py +++ b/apps/main/models.py @@ -5,6 +5,7 @@ from django.conf import settings from django.contrib.contenttypes import fields as generic from django.contrib.contenttypes.models import ContentType from django.contrib.postgres.fields import JSONField +from django.core.validators import EMPTY_VALUES from django.db import models from django.db.models import Q from django.utils.translation import gettext_lazy as _ @@ -287,4 +288,6 @@ class Carousel(models.Model): return self.content_object.establishment_type.index_name elif isinstance(self.content_object, News): return self.content_type.model + elif self.link not in EMPTY_VALUES: + return 'external' return None diff --git a/apps/main/serializers.py b/apps/main/serializers.py index c5ce9b25..6f80178d 100644 --- a/apps/main/serializers.py +++ b/apps/main/serializers.py @@ -137,6 +137,7 @@ class AwardSerializer(AwardBaseSerializer): class CarouselListSerializer(serializers.ModelSerializer): """Serializer for retrieving list of carousel items.""" + model_name = serializers.CharField() name = serializers.CharField() toque_number = serializers.IntegerField() @@ -160,6 +161,7 @@ class CarouselListSerializer(serializers.ModelSerializer): 'vintage_year', 'last_award', 'slug', + 'link', ] diff --git a/apps/main/urls/common.py b/apps/main/urls/common.py index bac16add..964442f9 100644 --- a/apps/main/urls/common.py +++ b/apps/main/urls/common.py @@ -8,5 +8,5 @@ common_urlpatterns = [ path('awards/', AwardView.as_view(), name='awards_list'), path('awards//', AwardRetrieveView.as_view(), name='awards_retrieve'), path('carousel/', CarouselListView.as_view(), name='carousel-list'), -path('determine-location/', DetermineLocation.as_view(), name='determine-location') + path('determine-location/', DetermineLocation.as_view(), name='determine-location') ]