From 591fdc9d6a1ae6d8798f49695ff7fc152796c3fc Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Thu, 23 Jan 2020 18:10:17 +0300 Subject: [PATCH] fix content-pages --- apps/main/views/common.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/main/views/common.py b/apps/main/views/common.py index b93096b4..801c623c 100644 --- a/apps/main/views/common.py +++ b/apps/main/views/common.py @@ -1,5 +1,6 @@ """Main app views.""" from django.http import Http404 +from django.conf import settings from rest_framework import generics, permissions from rest_framework.renderers import StaticHTMLRenderer from rest_framework.response import Response @@ -145,7 +146,9 @@ class ContentPageRetrieveView(NewsMixinView, generics.RetrieveAPIView): def get(self, request, *args, **kwargs): instance = self.get_object() - return Response(instance.description.get(request.locale)) + return Response(instance.description.get(request.locale, + instance.description.get(settings.FALLBACK_LOCALE, + next(iter(instance.description))))) class ContentPageIdRetrieveView(generics.RetrieveAPIView): @@ -158,7 +161,9 @@ class ContentPageIdRetrieveView(generics.RetrieveAPIView): def get(self, request, *args, **kwargs): instance = self.get_object() - return Response(instance.description.get(request.locale)) + return Response(instance.description.get(request.locale, + instance.description.get(settings.FALLBACK_LOCALE, + next(iter(instance.description))))) class ContentPageRetrieveAdminView(NewsMixinView, generics.RetrieveUpdateDestroyAPIView):