From bb6fb80c1e33a63b2ce6f93fdff1a16c378d4f9a Mon Sep 17 00:00:00 2001 From: Timur Nurlygayanov Date: Wed, 27 Mar 2013 18:44:00 +0400 Subject: [PATCH] Fixed small issue. --- tabula/tabula/windc/api.py | 3 +++ tabula/tabula/windc/tables.py | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tabula/tabula/windc/api.py b/tabula/tabula/windc/api.py index 01a5763..3630ee2 100644 --- a/tabula/tabula/windc/api.py +++ b/tabula/tabula/windc/api.py @@ -89,6 +89,9 @@ def services_list(request, datacenter_id): services = windcclient(request).activeDirectories.list(datacenter_id, session_id) services += windcclient(request).webServers.list(datacenter_id, session_id) + + for i in range(len(services)): + services[i]['operation'] = return services diff --git a/tabula/tabula/windc/tables.py b/tabula/tabula/windc/tables.py index dfa614c..28f675f 100644 --- a/tabula/tabula/windc/tables.py +++ b/tabula/tabula/windc/tables.py @@ -144,7 +144,10 @@ class UpdateServiceRow(tables.Row): link = request.__dict__['META']['HTTP_REFERER'] datacenter_id = re.search('windc/(\S+)', link).group(0)[6:-1] - return api.services_get(request, datacenter_id, service_id) + service = api.services_get(request, datacenter_id, service_id) + service['operation'] = api.get_status_message_for_service(request, service_id) + + return service STATUS_DISPLAY_CHOICES = ( @@ -200,12 +203,11 @@ class WinServicesTable(tables.DataTable): status_choices=STATUS_CHOICES, display_choices=STATUS_DISPLAY_CHOICES) - operation = tables.Column('operation', verbose_name=_('Operation'), - status=True) + operation = tables.Column('operation', verbose_name=_('Operation')) class Meta: name = 'services' verbose_name = _('Services') row_class = UpdateServiceRow - status_columns = ['status', 'operation'] + status_columns = ['status'] table_actions = (CreateService,)