From df42dff7d0dfa1b12c3ed56540ad0ea9f04ee13a Mon Sep 17 00:00:00 2001 From: gzbender Date: Fri, 28 Sep 2018 00:05:49 +0500 Subject: [PATCH] lil-583 --- apps/user/migrations/0025_merge_20180927_2353.py | 14 ++++++++++++++ project/templates/blocks/lil_store_js.html | 4 ++-- web/src/js/modules/common.js | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 apps/user/migrations/0025_merge_20180927_2353.py diff --git a/apps/user/migrations/0025_merge_20180927_2353.py b/apps/user/migrations/0025_merge_20180927_2353.py new file mode 100644 index 00000000..d5ab9d4a --- /dev/null +++ b/apps/user/migrations/0025_merge_20180927_2353.py @@ -0,0 +1,14 @@ +# Generated by Django 2.0.6 on 2018-09-27 23:53 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('user', '0024_referral'), + ('user', '0024_user_slug'), + ] + + operations = [ + ] diff --git a/project/templates/blocks/lil_store_js.html b/project/templates/blocks/lil_store_js.html index 0d19b124..29aacb22 100644 --- a/project/templates/blocks/lil_store_js.html +++ b/project/templates/blocks/lil_store_js.html @@ -22,11 +22,11 @@ urls: { courses: "{% url 'courses' %}", userProfileEdit: "{% url 'user-edit-profile' %}", - } + }, flags: { referrer: '{{ referrer.id|default:'' }}', referrerName: '{% if referrer %}{{ referrer.get_full_name }}{% endif %}', isReferralUrl: {{ is_referral_url|yesno:"true,false" }}, - } + }, }; diff --git a/web/src/js/modules/common.js b/web/src/js/modules/common.js index 775c4aea..d26e7ca1 100644 --- a/web/src/js/modules/common.js +++ b/web/src/js/modules/common.js @@ -11,7 +11,7 @@ window.baguetteBox = baguetteBox; $(document).ready(function () { const $popupAuth = $('.js-popup-auth'); - let authPopupActiveTab = 'login' + let authPopupActiveTab = 'login'; baguetteBox.run('.gallery'); // Добавляем заголовок X-CSRFToken для всех AJAX запросов JQuery. $.ajaxSetup({