[settings] : specifics to www

diff --git a/app/local_settings.py b/app/local_settings.py
index bf68f4b40d616c9ed8f2895268a62ec6f0e78e8a..50da5f11dea71894d5cc75d5f8477fae8c48bfb7 100644 (file)
--- a/app/local_settings.py
+++ b/app/local_settings.py
@@ -88,6 +88,19 @@ FIGGO_API_HEADER_AUTH='Lucca application=bd6d5481-40eb-414b-9135-434e12749223'
 #     ('www.starts.eu', 'organization_themes.vertigo-themes.www_starts_eu'),
 # ]
 
+# TIMESHEET
+
+TIMESHEET_USER_TEST = 849  # Emilie Zawadzki
+TIMESHEET_LOG_PATH = "/var/log/cron/"
+
+if DEBUG:
+    TIMESHEET_MASTER_MAIL = "zawadzki@ircam.fr"
+else:
+    TIMESHEET_MASTER_MAIL = "Hugues.Vinet@ircam.fr"
+
+MEDIA_BASE_URL = 'https://medias.ircam.fr/embed/media/'
+
+
 if DEBUG:
     PROTOCOLE = "http://"
 else:

diff --git a/app/settings.py b/app/settings.py
index 669e3d4f2c97d25bcbb2b3e69a44c4fca2812c85..eeae2035d55203455a8559492dd3016ffb4981bc 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -445,6 +445,7 @@ FILEBROWSER_SELECT_FORMATS = {
     'audio': ['Audio'],
 }
 
+
 #########################
 # ADMIN MENU            #
 #########################
@@ -602,6 +603,11 @@ DEBUG_TOOLBAR_PANELS = [
 ]
 
 # HIJACK
+HIJACK_DISPLAY_WARNING = False
+HIJACK_ALLOW_GET_REQUESTS = False
+HIJACK_REGISTER_ADMIN = False
+SILENCED_SYSTEM_CHECKS = ["hijack_admin.E001"]
+
 if DEBUG :
     SILENCED_SYSTEM_CHECKS = []
     HIJACK_LOGIN_REDIRECT_URL = "/person"
@@ -671,6 +677,7 @@ except ImportError as e:
     if "local_settings" not in str(e):
         raise e
 
+
 ####################
 # DYNAMIC SETTINGS #
 ####################
@@ -687,3 +694,4 @@ except ImportError:
     pass
 else:
     set_dynamic_settings(globals())
+