openstack/horizon
Code Issues Proposed changes

Merge "Permit 'exceptions' to be omitted from HORIZON_CONFIG"

Browse Source
This commit is contained in:
Jenkins 2014-09-16 14:29:29 +00:00 committed by Gerrit Code Review
commit d55368b0a1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack_dashboard/utils/settings.py
View File

@ -117,7 +117,7 @@ def update_dashboards(modules, horizon_config, installed_apps):
horizon_config['panel_customization'] = panel_customization
horizon_config['dashboards'] = tuple(dashboards)
horizon_config['exceptions'].update(exceptions)
horizon_config.setdefault('exceptions', {}).update(exceptions)
horizon_config.update(update_horizon_config)
horizon_config.setdefault('angular_modules', []).extend(angular_modules)
horizon_config.setdefault('js_files', []).extend(js_files)