openstack
/
murano-dashboard
Code Issues Proposed changes

Sync with new env statuses 

Change-Id: I8b87ed3cc6413a1de2d4b7e107f515380680af19
This commit is contained in:
Ekaterina Fedorova 2013-05-27 15:37:54 +04:00
parent 40e05fbf2c
commit 2065afb0db
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
muranodashboard/panel/tables.py
View File

@ -30,13 +30,13 @@ STATUS_ID_DEPLOYING = 'deploying'
STATUS_CHOICES = (
(None, True),
('Ready to configure', True),
('Ready to deploy', True),
('Active', True),
)
STATUS_DISPLAY_CHOICES = (
(STATUS_ID_READY, 'Ready to deploy'),
(STATUS_ID_PENDING, 'Wait for configuration'),
(STATUS_ID_READY, 'Active'),
(STATUS_ID_DEPLOYING, 'Deploy in progress'),
(STATUS_ID_PENDING, 'Wait for configuration'),
('', 'Ready to configure'),
)
@ -113,7 +113,7 @@ class DeployEnvironment(tables.BatchAction):
return False
def action(self, request, environment_id):
api.environment_deploy(request, environment_id)
api.environment_deploy(request, environment_id)
class ShowEnvironmentServices(tables.LinkAction):
@ -164,12 +164,6 @@ class EnvironmentsTable(tables.DataTable):
class ServicesTable(tables.DataTable):
STATUS_CHOICES = (
(None, True),
('Ready to deploy', True),
('Ready to configure', True),
)
name = tables.Column('name', verbose_name=_('Name'),
link=('horizon:project:murano:service_details'))
@ -188,4 +182,4 @@ class ServicesTable(tables.DataTable):
row_class = UpdateServiceRow
status_columns = ['status']
table_actions = (CreateService, DeleteService)
row_actions = (DeleteService,)
row_actions = (DeleteService,)