From cb9561e82d0ad5e72a9d004f25e624177cf7d7ed Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Tue, 24 Apr 2018 13:14:50 +0300 Subject: [PATCH] Fix config images urls --- api/v1/serializers/config.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/api/v1/serializers/config.py b/api/v1/serializers/config.py index fb12af1f..23b199f5 100644 --- a/api/v1/serializers/config.py +++ b/api/v1/serializers/config.py @@ -1,3 +1,4 @@ +from urllib.parse import urlparse, urlunparse from rest_framework import serializers from apps.config.models import Config @@ -40,16 +41,20 @@ class ConfigSerializer(serializers.ModelSerializer): def get_SCHOOL_LOGO_IMAGE(self, config): request = self.context.get('request') - if config.SCHOOL_LOGO_IMAGE: - SCHOOL_LOGO_IMAGE_url = config.SCHOOL_LOGO_IMAGE.url + http_host = request.META.get('HTTP_HOST') + if http_host and config.SCHOOL_LOGO_IMAGE: + domain = urlparse(http_host).path.split(':')[0] + SCHOOL_LOGO_IMAGE_url = 'http://' + domain + config.SCHOOL_LOGO_IMAGE.url return request.build_absolute_uri(SCHOOL_LOGO_IMAGE_url) else: return None def get_MAIN_PAGE_TOP_IMAGE(self, config): request = self.context.get('request') - if config.MAIN_PAGE_TOP_IMAGE: - MAIN_PAGE_TOP_IMAGE_url = config.MAIN_PAGE_TOP_IMAGE.url + http_host = request.META.get('HTTP_HOST') + if http_host and config.MAIN_PAGE_TOP_IMAGE: + domain = urlparse(http_host).path.split(':')[0] + MAIN_PAGE_TOP_IMAGE_url = 'http://' + domain + config.MAIN_PAGE_TOP_IMAGE.url return request.build_absolute_uri(MAIN_PAGE_TOP_IMAGE_url) else: return None