remotes/origin/hotfix/LIL-691
gzbender 7 years ago
parent 96d01b3a73
commit df42dff7d0
  1. 14
      apps/user/migrations/0025_merge_20180927_2353.py
  2. 4
      project/templates/blocks/lil_store_js.html
  3. 2
      web/src/js/modules/common.js

@ -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 = [
]

@ -22,11 +22,11 @@
urls: { urls: {
courses: "{% url 'courses' %}", courses: "{% url 'courses' %}",
userProfileEdit: "{% url 'user-edit-profile' %}", userProfileEdit: "{% url 'user-edit-profile' %}",
} },
flags: { flags: {
referrer: '{{ referrer.id|default:'' }}', referrer: '{{ referrer.id|default:'' }}',
referrerName: '{% if referrer %}{{ referrer.get_full_name }}{% endif %}', referrerName: '{% if referrer %}{{ referrer.get_full_name }}{% endif %}',
isReferralUrl: {{ is_referral_url|yesno:"true,false" }}, isReferralUrl: {{ is_referral_url|yesno:"true,false" }},
} },
}; };
</script> </script>

@ -11,7 +11,7 @@ window.baguetteBox = baguetteBox;
$(document).ready(function () { $(document).ready(function () {
const $popupAuth = $('.js-popup-auth'); const $popupAuth = $('.js-popup-auth');
let authPopupActiveTab = 'login' let authPopupActiveTab = 'login';
baguetteBox.run('.gallery'); baguetteBox.run('.gallery');
// Добавляем заголовок X-CSRFToken для всех AJAX запросов JQuery. // Добавляем заголовок X-CSRFToken для всех AJAX запросов JQuery.
$.ajaxSetup({ $.ajaxSetup({

Loading…
Cancel
Save