mitri4
/
LilSchool
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev' into 'master'

Browse Source 
Dev

See merge request lilcity/backend!56
remotes/origin/feature/effective_amount
cfwme 8 years ago
parent 803e808035 7369d37ff4
commit 3db62c1734
6 changed files with 21 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      apps/config/templatetags/settings.py
  2. 2
      apps/user/views.py
  3. 1
      docker/.env.example
  4. 3
      project/settings.py
  5. 2
      project/templates/lilcity/about.html
  6. 6
      project/templates/lilcity/index.html

9
apps/config/templatetags/settings.py
Unescape View File

@ -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)

2
apps/user/views.py
Unescape View File

@ -2,6 +2,7 @@ import arrow
from io import BytesIO from io import BytesIO
from PIL import Image from PIL import Image
from uuid import uuid4
from os.path import splitext from os.path import splitext
from datetime import timedelta from datetime import timedelta
from paymentwall import Pingback from paymentwall import Pingback
@ -224,6 +225,7 @@ class UserEditView(UpdateView):
if ext == 'JPG': if ext == 'JPG':
ext = 'JPEG' ext = 'JPEG'
photo.save(buffer, ext) photo.save(buffer, ext)
fname = str(uuid4()) + '.' + ext.lower()
self.object.photo.save(fname, buffer) self.object.photo.save(fname, buffer)
buffer.close() buffer.close()
if not request.POST._mutable: if not request.POST._mutable:

1
docker/.env.example
Unescape View File

@ -19,3 +19,4 @@ PAYMENTWALL_APP_KEY=d6f02b90cf6b16220932f4037578aff7
PAYMENTWALL_SECRET_KEY=4ea515bf94e34cf28646c2e12a7b8707 PAYMENTWALL_SECRET_KEY=4ea515bf94e34cf28646c2e12a7b8707
MIXPANEL_TOKEN=79bd6bfd98667ed977737e6810b8abcd MIXPANEL_TOKEN=79bd6bfd98667ed977737e6810b8abcd
RAVEN_DSN=https://b545dac0ae0545a1bcfc443326fe5850:6f9c900cef7f4c11b63561030b37d15c@sentry.io/1197254 RAVEN_DSN=https://b545dac0ae0545a1bcfc443326fe5850:6f9c900cef7f4c11b63561030b37d15c@sentry.io/1197254
ROISTAT_COUNTER_ID=09db30c750035ae3d70a41d5f10d59ec

3
project/settings.py
Unescape View File

@ -259,6 +259,9 @@ RAVEN_CONFIG = {
'release': raven.fetch_git_sha(BASE_DIR), '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/' INSTAGRAM_RESULTS_PATH = 'media/instagram/results/'
DATA_UPLOAD_MAX_MEMORY_SIZE = 20242880 DATA_UPLOAD_MAX_MEMORY_SIZE = 20242880

2
project/templates/lilcity/about.html
Unescape View File

@ -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 %}
<div <div
class="main main_default" class="main main_default"
{% if config.MAIN_PAGE_TOP_IMAGE %} {% if config.MAIN_PAGE_TOP_IMAGE %}

6
project/templates/lilcity/index.html
Unescape View File

@ -1,4 +1,5 @@
{% load static %} {% load static %}
{% load setting from settings %}
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
@ -73,7 +74,10 @@
var schoolAmountForDiscount = parseFloat({{ config.SERVICE_DISCOUNT_MIN_AMOUNT }}); var schoolAmountForDiscount = parseFloat({{ config.SERVICE_DISCOUNT_MIN_AMOUNT }});
</script> </script>
{% comment %} ROISTAT {% endcomment %} {% comment %} ROISTAT {% endcomment %}
<script>(function(w, d, s, h, id) { w.roistatProjectId = id; w.roistatHost = h; var p = d.location.protocol == "https:" ? "https://" : "http://"; var u = /^.*roistat_visit=[^;]+(.*)?$/.test(d.cookie) ? "/dist/module.js" : "/api/site/1.0/"+id+"/init"; var js = d.createElement(s); js.charset="UTF-8"; js.async = 1; js.src = p+h+u; var js2 = d.getElementsByTagName(s)[0]; js2.parentNode.insertBefore(js, js2);})(window, document, 'script', 'cloud.roistat.com', '09db30c750035ae3d70a41d5f10d59ec');</script> <script>
ROISTAT_COUNTER_ID = "{% setting 'ROISTAT_COUNTER_ID' %}"
(function(w, d, s, h, id) { w.roistatProjectId = id; w.roistatHost = h; var p = d.location.protocol == "https:" ? "https://" : "http://"; var u = /^.*roistat_visit=[^;]+(.*)?$/.test(d.cookie) ? "/dist/module.js" : "/api/site/1.0/"+id+"/init"; var js = d.createElement(s); js.charset="UTF-8"; js.async = 1; js.src = p+h+u; var js2 = d.getElementsByTagName(s)[0]; js2.parentNode.insertBefore(js, js2);})(window, document, 'script', 'cloud.roistat.com', ROISTAT_COUNTER_ID);
</script>
{% block foot %}{% endblock foot %} {% block foot %}{% endblock foot %}
</body> </body>
</html> </html>

Write Preview
Loading…
Cancel
Save