pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/monolith' into vue

Browse Source
This commit is contained in:
Patrick Smith
2018-08-02 16:36:22 -04:00
parent 07d2f3a124 32cc6cb520
commit 165a5bf374
41 changed files with 478 additions and 510 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
atst/app.py
View File

@@ -12,7 +12,7 @@ from atst.routes.workspaces import bp as workspace_routes
from atst.routes.requests import requests_bp
ENV = os.getenv("TORNADO_ENV", "dev")
ENV = os.getenv("FLASK_ENV", "dev")
def make_app(config):
@@ -40,7 +40,7 @@ def make_app(config):
def make_flask_callbacks(app):
@app.before_request
def set_globals():
def _set_globals():
g.navigationContext = (
"workspace"
if re.match("\/workspaces\/[A-Za-z0-9]*", request.url)
@@ -84,6 +84,10 @@ def make_config():
config = ConfigParser()
config.optionxform = str
config_files = [BASE_CONFIG_FILENAME, ENV_CONFIG_FILENAME]
if OVERRIDE_CONFIG_FILENAME:
config_files.append(OVERRIDE_CONFIG_FILENAME)
config_files = [BASE_CONFIG_FILENAME, ENV_CONFIG_FILENAME]
if OVERRIDE_CONFIG_FILENAME:
config_files.append(OVERRIDE_CONFIG_FILENAME)