Version 1.3.0

Custom base URL prefix
filak · Apr 30, 2019 · 027db39 · 027db39
1 parent 81871a2
commit 027db39
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/flask-app/instance/conf/mtw.ini b/flask-app/instance/conf/mtw.ini
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# *** Config version 0.1.6 ***
+# *** Config version 0.1.7 ***
 ### Important values are marked with !  ###
 ### ! This file MUST BE UTF-8 encoded ! ###
 ### ! Restart the App after modifying ! ###
@@ -88,6 +88,9 @@ MESH_TREE = {
 ### Background Worker host:port [dev: 5903 -- prod: 55933] ###
 WORKER_HOST = http://localhost:5903/
 
+### Base URL prefix - default: None ###
+#APP_URL_PREFIX = /fr
+
 
 [sparqlconf]
 

diff --git a/flask-app/mtw/flask.py b/flask-app/mtw/flask.py
@@ -46,7 +46,7 @@ def __call__(self, environ, start_response):
 
 app.config.update(dict(
     APP_NAME = 'MTW',
-    APP_VER = '1.2.9',
+    APP_VER = '1.3.0',
     API_VER = '1.0.0',
     APP_URL = '/mtw',
     DEFAULT_THEME = 'slate',
@@ -82,8 +82,10 @@ def __call__(self, environ, start_response):
 
 
 def getPath(path):
-    customDir = app.config['APP_URL']
-    return(customDir+path)
+    app_prefix = app.config['APP_URL_PREFIX']
+    app_base = app.config['APP_URL']
+    return(app_prefix+app_base+path)
+
 
 ###  Add security HTTP headers
 csrf = SeaSurf(app)

diff --git a/flask-app/mtw_utils/mtw_utils.py b/flask-app/mtw_utils/mtw_utils.py
@@ -58,6 +58,7 @@ def getAdminConfValue(conf):
 def getLocalConfValue(conf):
     d = {}
     try:
+        d['APP_URL_PREFIX'] = conf.get('appconf', 'APP_URL_PREFIX', fallback='')
         d['DATABASE_NAME'] = conf.get('appconf', 'DATABASE_NAME', fallback='mtw.db')
         d['DATABASE'] = get_instance_dir( app, 'db/'+d['DATABASE_NAME'] )
         d['DEFAULT_THEME'] = conf.get('appconf', 'DEFAULT_THEME', fallback='slate')