From c864fe2b01da49d394f61b3744bf36e28663a6b4 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Wed, 7 Mar 2018 16:58:36 +0300 Subject: [PATCH] Add INSTAGRAM_PROFILE_URL dynamic config param --- api/v1/serializers/config.py | 5 +++-- project/settings.py | 17 +++++++++++++++++ project/templates/lilcity/main.html | 2 +- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/api/v1/serializers/config.py b/api/v1/serializers/config.py index af2bb0cb..e17ce57e 100644 --- a/api/v1/serializers/config.py +++ b/api/v1/serializers/config.py @@ -13,11 +13,12 @@ def _set_constance_value(key, value): class ConfigSerializer(serializers.Serializer): - INSTAGRAM_CLIENT_ACCESS_TOKEN = serializers.CharField(required=False) - INSTAGRAM_CLIENT_SECRET = serializers.CharField(required=False) SERVICE_COMMISSION = serializers.IntegerField(required=False) SERVICE_DISCOUNT_MIN_AMOUNT = serializers.IntegerField(required=False) SERVICE_DISCOUNT = serializers.IntegerField(required=False) + INSTAGRAM_CLIENT_ACCESS_TOKEN = serializers.CharField(required=False) + INSTAGRAM_CLIENT_SECRET = serializers.CharField(required=False) + INSTAGRAM_PROFILE_URL = serializers.CharField(required=False) def to_representation(self, instance): ret = OrderedDict() diff --git a/project/settings.py b/project/settings.py index 0cf8a2f9..6860b3d0 100644 --- a/project/settings.py +++ b/project/settings.py @@ -232,6 +232,7 @@ CONSTANCE_BACKEND = 'constance.backends.database.DatabaseBackend' CONSTANCE_CONFIG = OrderedDict(( ('INSTAGRAM_CLIENT_ACCESS_TOKEN', ('7145314808.f6fa114.ce354a5d876041fc9d3db04b0045587d', '')), ('INSTAGRAM_CLIENT_SECRET', ('2334a921425140ccb180d145dcd35b25', '')), + ('INSTAGRAM_PROFILE_URL', ('#', 'URL профиля Instagram.')), ('INSTAGRAM_RESULTS_TAG', ('#lil_акварель', 'Тэг результатов работ.')), ('INSTAGRAM_RESULTS_PATH', ('media/instagram/results/', 'Путь до результатов работ.')), ('SERVICE_COMMISSION', (10, 'Комиссия сервиса в процентах.')), @@ -239,6 +240,22 @@ CONSTANCE_CONFIG = OrderedDict(( ('SERVICE_DISCOUNT', (1000, 'Комиссия сервиса при покупке всех дней.')), )) +CONSTANCE_CONFIG_FIELDSETS = OrderedDict({ + 'Service': ( + 'SERVICE_COMMISSION', + 'SERVICE_DISCOUNT_MIN_AMOUNT', + 'SERVICE_DISCOUNT', + ), + 'Instagram': ( + 'INSTAGRAM_CLIENT_ACCESS_TOKEN', + 'INSTAGRAM_CLIENT_SECRET', + 'INSTAGRAM_PROFILE_URL', + 'INSTAGRAM_RESULTS_TAG', + 'INSTAGRAM_RESULTS_PATH', + ), +}) + + try: from .local_settings import * except ImportError: diff --git a/project/templates/lilcity/main.html b/project/templates/lilcity/main.html index a6a812c0..817a23f6 100644 --- a/project/templates/lilcity/main.html +++ b/project/templates/lilcity/main.html @@ -190,7 +190,7 @@
Галерея

Тысячи шедевров уже созданы благодаря Lil City School. Более 10000 работ можно - увидеть в Инстаграм

+ увидеть в Инстаграм