x/tuskar-ui
Code Issues Proposed changes

Merge "Remove deprecated features"

Browse Source
This commit is contained in:
Jenkins 2013-04-25 11:07:28 +00:00 committed by Gerrit Code Review
commit 813c04fd5e
1 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
openstack_dashboard/settings.py
View File

@ -50,7 +50,6 @@ MEDIA_ROOT = os.path.abspath(os.path.join(ROOT_PATH, '..', 'media'))
MEDIA_URL = '/media/' MEDIA_URL = '/media/'
STATIC_ROOT = os.path.abspath(os.path.join(ROOT_PATH, '..', 'static')) STATIC_ROOT = os.path.abspath(os.path.join(ROOT_PATH, '..', 'static'))
STATIC_URL = '/static/' STATIC_URL = '/static/'
ADMIN_MEDIA_PREFIX = '/static/admin/'
ROOT_URLCONF = 'openstack_dashboard.urls' ROOT_URLCONF = 'openstack_dashboard.urls'
@ -191,30 +190,3 @@ COMPRESS_OFFLINE_CONTEXT = {
if DEBUG: if DEBUG:
logging.basicConfig(level=logging.DEBUG) logging.basicConfig(level=logging.DEBUG)
# Deprecation for Essex/Folsom dashboard names; remove this code in H.
_renames = (
('horizon.dashboards.nova', 'openstack_dashboard.dashboards.project'),
('horizon.dashboards.syspanel', 'openstack_dashboard.dashboards.admin'),
('horizon.dashboards.settings', 'openstack_dashboard.dashboards.settings')
)
INSTALLED_APPS = list(INSTALLED_APPS)
_dashboards = list(HORIZON_CONFIG['dashboards'])
for old, new in _renames:
if old in INSTALLED_APPS:
warnings.warn('The "%s" package is deprecated. Please update your '
'INSTALLED_APPS setting to use the new "%s" package.\n'
% (old, new), Warning)
INSTALLED_APPS[INSTALLED_APPS.index(old)] = new
_old_name = old.split(".")[-1]
if _old_name in HORIZON_CONFIG['dashboards'] and _old_name != "settings":
_new_name = new.split(".")[-1]
warnings.warn('The "%s" dashboard name is deprecated. Please update '
'your HORIZON_CONFIG["dashboards"] setting to use the '
'new "%s" dashboard name.\n' % (_old_name, _new_name),
Warning)
_dashboards[_dashboards.index(_old_name)] = _new_name
HORIZON_CONFIG['dashboards'] = _dashboards