openstack/horizon
Code Issues Proposed changes

Merge "Preserve dashboard order configured from settings"

Browse Source
This commit is contained in:
Jenkins 2014-09-25 18:06:33 +00:00 committed by Gerrit Code Review
commit 1b080e5e6c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openstack_dashboard/utils/settings.py
View File

@ -85,6 +85,7 @@ def update_dashboards(modules, horizon_config, installed_apps):
applied in alphabetical order of files where it was imported. applied in alphabetical order of files where it was imported.
""" """
enabled_dashboards = [] enabled_dashboards = []
disabled_dashboards = []
exceptions = {} exceptions = {}
apps = [] apps = []
angular_modules = [] angular_modules = []
@ -93,6 +94,8 @@ def update_dashboards(modules, horizon_config, installed_apps):
update_horizon_config = {} update_horizon_config = {}
for key, config in import_dashboard_config(modules): for key, config in import_dashboard_config(modules):
if config.get('DISABLED', False): if config.get('DISABLED', False):
if config.get('DASHBOARD'):
disabled_dashboards.append(config.get('DASHBOARD'))
continue continue
apps.extend(config.get('ADD_INSTALLED_APPS', [])) apps.extend(config.get('ADD_INSTALLED_APPS', []))
exceptions.update(config.get('ADD_EXCEPTIONS', {})) exceptions.update(config.get('ADD_EXCEPTIONS', {}))
@ -111,7 +114,7 @@ def update_dashboards(modules, horizon_config, installed_apps):
# Preserve the dashboard order specified in settings # Preserve the dashboard order specified in settings
config_dashboards = horizon_config.get('dashboards', []) config_dashboards = horizon_config.get('dashboards', [])
dashboards = ([d for d in config_dashboards dashboards = ([d for d in config_dashboards
if d in enabled_dashboards] + if d not in disabled_dashboards] +
[d for d in enabled_dashboards [d for d in enabled_dashboards
if d not in config_dashboards]) if d not in config_dashboards])