Fix DEBUG management, move team person block

diff --git a/app/local_settings.py b/app/local_settings.py
index 34e7bd09810a2eb34a3e23b57eef6e8e1ce5e926..cfc236eed4d10845c51aa51aae6ae811fbe55bb0 100644 (file)
--- a/app/local_settings.py
+++ b/app/local_settings.py
@@ -181,8 +181,10 @@ EVENT_PASS_URL = EVENT_DOMAIN+"/pub.php/pass/"
 EVENT_CONFIRMATION_URL = EVENT_DOMAIN+"/pub.php/cart/done?transaction_id=%s"
 EVENT_EXCLUDE_TAG_LIST = ['tournees', ]
 
-TINYMCE_SETUP_JS = "/static/js/tinymce_setup.js"
-# TINYMCE_SETUP_JS = "/srv/app/organization/core/static/js/tinymce_setup.js"
+if DEBUG:
+    TINYMCE_SETUP_JS = "/srv/app/organization/core/static/js/tinymce_setup.js"
+else:
+    TINYMCE_SETUP_JS = "/static/js/tinymce_setup.js"
 
 SLUGIFY = 'django.template.defaultfilters.slugify'
 

diff --git a/app/templates/pages/page.html b/app/templates/pages/page.html
index d38df533adc236c244e8446df8b6dbb02fcadbe4..158c61014aa26f297ec5447be402b0bd144c7e5c 100644 (file)
--- a/app/templates/pages/page.html
+++ b/app/templates/pages/page.html
@@ -106,9 +106,6 @@
 
         <div class="white-bg">
 
-            {% block page_person_list %}
-            {% endblock %}
-
             {% block page_sub_content %}
                 {% with object.blocks.all as blocks %}
                     {% include "core/inc/block.html" %}
@@ -133,6 +130,9 @@
             {% block page_sub_content_2 %}
             {% endblock %}
 
+            {% block page_person_list %}
+            {% endblock %}
+
             {% block logo %}
                 {% with page.images.all|get_type:'logo' as images %}
                     {% if images %}

diff --git a/docker-compose.yml b/docker-compose.yml
index 841cded20d54db095731b2636f847f204776a6a2..9376ce333f99c1456eb6ca92c21aea5fe3796a16 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -57,7 +57,7 @@ app:
   links:
     - db
   environment:
-   - DEBUG='False'
+   - DEBUG=False
 
 nginx:
   image: nginx

diff --git a/env/dev.yml b/env/dev.yml
index 95ea9e44fe8461c40b811c948cd6ea16cbcdce7c..2293a025c17b0730879f7addeacee4efdee93383 100644 (file)
--- a/env/dev.yml
+++ b/env/dev.yml
@@ -23,8 +23,7 @@ app:
   command: /bin/sh scripts/app.sh --runserver
   volumes:
     - ./app/:/srv/app
-    - /var/lib/mysql
   ports:
     - "9020:8000"
   environment:
-    - DEBUG='True'
+    - DEBUG=True