stackforge-attic/murano-docs
Code Issues Proposed changes

Fixed small issue.

Browse Source
This commit is contained in:
Timur Nurlygayanov
2013-03-27 18:44:00 +04:00
parent b68ed79261
commit bb6fb80c1e
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tabula/tabula/windc/api.py
View File

@@ -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

10
tabula/tabula/windc/tables.py
View File

@@ -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,)