diff --git a/apps/config/templatetags/settings.py b/apps/config/templatetags/settings.py new file mode 100644 index 00000000..57b6076c --- /dev/null +++ b/apps/config/templatetags/settings.py @@ -0,0 +1,9 @@ +from django import template +from django.conf import settings + +register = template.Library() + + +@register.simple_tag +def setting(setting): + return getattr(settings, setting, None) diff --git a/apps/user/views.py b/apps/user/views.py index 257b8103..14ecef7b 100644 --- a/apps/user/views.py +++ b/apps/user/views.py @@ -2,6 +2,7 @@ import arrow from io import BytesIO from PIL import Image +from uuid import uuid4 from os.path import splitext from datetime import timedelta from paymentwall import Pingback @@ -224,6 +225,7 @@ class UserEditView(UpdateView): if ext == 'JPG': ext = 'JPEG' photo.save(buffer, ext) + fname = str(uuid4()) + '.' + ext.lower() self.object.photo.save(fname, buffer) buffer.close() if not request.POST._mutable: diff --git a/docker/.env.example b/docker/.env.example index afc3f744..bc750b18 100644 --- a/docker/.env.example +++ b/docker/.env.example @@ -19,3 +19,4 @@ PAYMENTWALL_APP_KEY=d6f02b90cf6b16220932f4037578aff7 PAYMENTWALL_SECRET_KEY=4ea515bf94e34cf28646c2e12a7b8707 MIXPANEL_TOKEN=79bd6bfd98667ed977737e6810b8abcd RAVEN_DSN=https://b545dac0ae0545a1bcfc443326fe5850:6f9c900cef7f4c11b63561030b37d15c@sentry.io/1197254 +ROISTAT_COUNTER_ID=09db30c750035ae3d70a41d5f10d59ec diff --git a/project/settings.py b/project/settings.py index ed1785a4..b8b749d2 100644 --- a/project/settings.py +++ b/project/settings.py @@ -259,6 +259,9 @@ RAVEN_CONFIG = { 'release': raven.fetch_git_sha(BASE_DIR), } +# Roistat counter id +ROISTAT_COUNTER_ID = os.getenv('ROISTAT_COUNTER_ID', None) + INSTAGRAM_RESULTS_PATH = 'media/instagram/results/' DATA_UPLOAD_MAX_MEMORY_SIZE = 20242880 diff --git a/project/templates/lilcity/about.html b/project/templates/lilcity/about.html index 1a46b8e3..4411618e 100644 --- a/project/templates/lilcity/about.html +++ b/project/templates/lilcity/about.html @@ -1,4 +1,4 @@ -{% extends "templates/lilcity/index.html" %} {% load static %} {% block title %}О школе{% endblock title %} {% block content %} {% load static %} +{% extends "templates/lilcity/index.html" %} {% load static %} {% block title %}О школе{% endblock title %} {% block content %}
@@ -73,7 +74,10 @@ var schoolAmountForDiscount = parseFloat({{ config.SERVICE_DISCOUNT_MIN_AMOUNT }}); {% comment %} ROISTAT {% endcomment %} - + {% block foot %}{% endblock foot %}