← Back to branch summary

~ubuntu-branches/ubuntu/trusty/horizon/trusty

« back to all changes in this revision

Viewing changes to openstack_dashboard/utils/settings.py

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-03-31 17:31:49 UTC
  • mfrom: (1.1.38)
  • Revision ID: package-import@ubuntu.com-20140331173149-f28yjk2s8pt15fqj
Tags: 1:2014.1~rc1-0ubuntu1
https://launchpad.net/bugs/1288245
https://launchpad.net/bugs/1291653
* New upstream release candidate (LP: #1288245).
  - d/static/*: Refreshed assets for new upstream release.
* d/theme/*: Refresh Ubuntu theme against Icehouse templates (LP: #1291653).

Show diffs side-by-side

added added

removed removed

Lines of Context:
openstack_dashboard/utils/settings.py
44
44
            if hasattr(submodule, 'DASHBOARD'):
45
45
                dashboard = submodule.DASHBOARD
46
46
                config[dashboard].update(submodule.__dict__)
47
 
            elif hasattr(submodule, 'PANEL'):
 
47
            elif (hasattr(submodule, 'PANEL')
 
48
                     or hasattr(submodule, 'PANEL_GROUP')):
48
49
                config[submodule.__name__] = submodule.__dict__
49
 
                #_update_panels(config, submodule)
50
50
            else:
51
51
                logging.warning("Skipping %s because it doesn't have DASHBOARD"
52
 
                                " or PANEL defined.", submodule.__name__)
 
52
                                ", PANEL or PANEL_GROUP defined.",
 
53
                                submodule.__name__)
53
54
    return sorted(config.iteritems(),
54
55
                  key=lambda c: c[1]['__name__'].rsplit('.', 1))
55
56
 
98
99
            apps.extend(config.get('ADD_INSTALLED_APPS', []))
99
100
            if config.get('DEFAULT', False):
100
101
                horizon_config['default_dashboard'] = dashboard
101
 
        elif config.get('PANEL'):
 
102
        elif config.get('PANEL') or config.get('PANEL_GROUP'):
102
103
            panel_customization.append(config)
103
104
    horizon_config['panel_customization'] = panel_customization
104
105
    horizon_config['dashboards'] = tuple(dashboards)
105
106
    horizon_config['exceptions'].update(exceptions)
106
 
    installed_apps.extend(apps)
 
107
    installed_apps[:] = apps + installed_apps