git diff diff --git a/openstack_dashboard/utils/settings.py b/openstack_dashboard/utils/settings.py index 2046cfb..229cc9b 100644 --- a/openstack_dashboard/utils/settings.py +++ b/openstack_dashboard/utils/settings.py @@ -98,7 +98,7 @@ def update_dashboards(modules, horizon_config, installed_apps):
enabled_dashboards = [] disabled_dashboards = [] - exceptions = {} + exceptions = horizon_config.get('exceptions', {}) apps = [] angular_modules = [] js_files = set() @@ -110,7 +110,8 @@ def update_dashboards(modules, horizon_config, installed_apps): disabled_dashboards.append(config.get('DASHBOARD')) continue apps.extend(config.get('ADD_INSTALLED_APPS', [])) - exceptions.update(config.get('ADD_EXCEPTIONS', {})) + for category, exc_list in config.get('ADD_EXCEPTIONS', {}).iteritems(): + exceptions[category] = exceptions.get(category, ()) + exc_list angular_modules.extend(config.get('ADD_ANGULAR_MODULES', [])) js_files.update(config.get('ADD_JS_FILES', [])) update_horizon_config.update(
git diff dashboard/ utils/settings. py b/openstack_ dashboard/ utils/settings. py dashboard/ utils/settings. py dashboard/ utils/settings. py dashboards( modules, horizon_config, installed_apps):
diff --git a/openstack_
index 2046cfb..229cc9b 100644
--- a/openstack_
+++ b/openstack_
@@ -98,7 +98,7 @@ def update_
enabled_ dashboards = [] dashboards = [] config. get('exceptions ', {}) modules = [] dashboards( modules, horizon_config, installed_apps):
disabled_ dashboards. append( config. get('DASHBOARD' ))
continue
apps. extend( config. get('ADD_ INSTALLED_ APPS', [])) update( config. get('ADD_ EXCEPTIONS' , {})) get('ADD_ EXCEPTIONS' , {}).iteritems(): category] = exceptions. get(category, ()) + exc_list
angular_ modules. extend( config. get('ADD_ ANGULAR_ MODULES' , []))
js_files. update( config. get('ADD_ JS_FILES' , []))
update_ horizon_ config. update(
disabled_
- exceptions = {}
+ exceptions = horizon_
apps = []
angular_
js_files = set()
@@ -110,7 +110,8 @@ def update_
- exceptions.
+ for category, exc_list in config.
+ exceptions[