openstack/trove-dashboard
Code Issues Proposed changes

Don't import ceilometer_data

Browse Source 
This import is apparently not used and now no longer exists. don't
import it any longer. a bigger fix is required to get rid of all
unneeded imports (like Ic121ac52d261b1f4eb972a0075cd3a09883fb100).

Also due to change in legacy swift panel we need to reverse some
logic in detecting the legacy panel.

Change-Id: Ifbb3424bc174829d66518c4a167a03a0cd1feb1c
Co-Authored-By: Duk Loi <duk@tesora.com>
This commit is contained in:
Amrith Kumar
2016-11-29 11:36:51 -05:00
committed by Duk Loi
parent de0ecc11dc
commit db411a56eb
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
trove_dashboard/content/database_backups/tables.py
View File

@@ -87,11 +87,12 @@ class DownloadBackup(tables.LinkAction):
'object_path': object_path})
def allowed(self, request, datum):
legacy_swift_panel_enabled = True
legacy_swift_panel_enabled = False
if ('swift_panel' in settings.HORIZON_CONFIG and
settings.HORIZON_CONFIG['swift_panel'] == 'angular'):
legacy_swift_panel_enabled = False
return legacy_swift_panel_enabled and datum.status == 'COMPLETED'
settings.HORIZON_CONFIG['swift_panel'] == 'legacy' and
datum.status == 'COMPLETED'):
legacy_swift_panel_enabled = True
return legacy_swift_panel_enabled
class DeleteBackup(tables.DeleteAction):

2
trove_dashboard/test/test_data/utils.py
View File

@@ -15,7 +15,6 @@ from openstack_dashboard.test.test_data import utils
def load_test_data(load_onto=None):
from openstack_dashboard.test.test_data import ceilometer_data
from openstack_dashboard.test.test_data import cinder_data
from openstack_dashboard.test.test_data import exceptions
from openstack_dashboard.test.test_data import glance_data
@@ -42,7 +41,6 @@ def load_test_data(load_onto=None):
neutron_data.data,
swift_data.data,
heat_data.data,
ceilometer_data.data,
trove_data.data,
trove_keystone_data.data,
)