Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Anatoly 2019-08-23 12:16:58 +03:00
commit eb07bff654

View File

@ -1,6 +1,6 @@
"""Main app views."""
from django.http.response import HttpResponseRedirect
from rest_framework import generics, permissions
from rest_framework.response import Response
from main import methods, models, serializers
@ -13,7 +13,7 @@ class DetermineSiteView(generics.GenericAPIView):
user_ip = methods.get_user_ip(request)
country_code = methods.determine_country_code(user_ip)
url = methods.determine_user_site_url(country_code)
return HttpResponseRedirect(url)
return Response(data={'url': url})
class SiteSettingsView(generics.RetrieveAPIView):