darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-02-05 02:42:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:alphagov/notifications-admin

Browse Source
This commit is contained in:
Martyn Inglis
2016-01-19 15:44:26 +00:00
parent a74c78ebd5 d7e6e6ab0c
commit fb77052585
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/__init__.py
View File

@@ -75,15 +75,16 @@ def init_csrf(application):
def init_app(app, config_overrides): def init_app(app, config_overrides):
for key, value in app.config.items():
if key in os.environ:
app.config[key] = convert_to_boolean(os.environ[key])
if config_overrides: if config_overrides:
for key in app.config.keys(): for key in app.config.keys():
if key in config_overrides: if key in config_overrides:
app.config[key] = config_overrides[key] app.config[key] = config_overrides[key]
for key, value in app.config.items():
if key in os.environ:
app.config[key] = convert_to_boolean(os.environ[key])
@app.context_processor @app.context_processor
def inject_global_template_variables(): def inject_global_template_variables():
return {'asset_path': '/static/'} return {'asset_path': '/static/'}