Merge branch 'master' of gitlab.com:lilschool/site into feature/packages-page-1-08-19

7 years ago · c615bd1533
parent 940d075759 5407ccebb5
commit c615bd1533
3 changed files with 66 additions and 76 deletions
--- a/project/settings.py
+++ b/project/settings.py
@ -196,11 +196,9 @@ LOGGING = {
            'class': 'logging.StreamHandler',
            'formatter': 'verbose',
        },
-        'log_file': {
-            'level': 'DEBUG',
-            'filters': ['require_debug_true'],
-            'class': 'logging.StreamHandler',
-            'formatter': 'verbose',
+        'sentry': {
+            'level': 'WARNING',
+            'class': 'raven.contrib.django.raven_compat.handlers.SentryHandler',
        },
    },
    'loggers': {
@ -216,22 +214,12 @@ LOGGING = {
            'handlers': ['console', ],
        },
        '': {
-            'handlers': ['console', 'log_file',],
+            'handlers': ['sentry',],
            'level': "INFO",
        },
    }
 }

-if os.path.exists(os.path.join(BASE_DIR, '/media/logs')):
-    LOGGING['handlers']['log_file'] = {
-        'level': 'INFO',
-        'class': 'logging.handlers.RotatingFileHandler',
-        'filename': 'media/logs/main.log',
-        'maxBytes': 1024 * 1024 * 15,  # 5 MB
-        'backupCount': 7,
-        'formatter': 'verbose',
-        'filters': ['require_debug_false'],
-    }

 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/2.0/howto/static-files/
--- a/project/templates/blocks/lil_store_js.html
+++ b/project/templates/blocks/lil_store_js.html
@ -39,12 +39,13 @@
      isGiftCertificateUrl: {{ is_gift_certificate_url|yesno:"true,false" }},
    },
    data: {},
-    urlIs: (urlPatternNames) => {
+    urlIs: function(urlPatternNames) {
        if(! Array.isArray(urlPatternNames)){
            urlPatternNames = [urlPatternNames];
        }
-        return urlPatternNames.filter(
-          urlPatternName => window.location.pathname.search(window.LIL_STORE.urls[urlPatternName]) > -1).length > 0;
+        return urlPatternNames.filter(function(urlPatternName){
+          return window.location.pathname.search(window.LIL_STORE.urls[urlPatternName]) > -1;
+        }).length > 0;
    },
    isIndexPage: window.location.pathname == '/',
  };
--- a/project/templates/lilcity/layer.html
+++ b/project/templates/lilcity/layer.html
@ -48,6 +48,12 @@
        }
    </script>

+
+    {% block layer_head %}{% endblock layer_head %}
+  </head>
+  <body>
+    {% block layer_body %}
+    {% endblock layer_body %}
    <!-- Facebook Pixel Code -->
      <script>
        !function(f,b,e,v,n,t,s)
@ -106,10 +112,5 @@
      <noscript><div><img src="https://mc.yandex.ru/watch/49354039" style="position:absolute; left:-9999px;" alt="" /></div></noscript>
      <!-- /Yandex.Metrika counter -->
      {% include "templates/blocks/mixpanel.html" %}
-    {% block layer_head %}{% endblock layer_head %}
-  </head>
-  <body>
-    {% block layer_body %}
-    {% endblock layer_body %}
  </body>
 </html>