openstack
/
horizon
Code Issues Proposed changes

Translatable value for Status column for Services 

Change-Id: I2b68d2c5ad43ef005590b1fe3658bbae0b14d00e
Closes-Bug: #1326152
This commit is contained in:
lin-hua-cheng 2014-06-03 22:25:10 -07:00
parent 8b4108004a
commit 0234642702
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
openstack_dashboard/dashboards/admin/info/tables.py
View File

@ -19,6 +19,15 @@ from horizon import tables
from horizon.utils import filters as utils_filters
SERVICE_ENABLED = "enabled"
SERVICE_DISABLED = "disabled"
SERVICE_STATUS_DISPLAY_CHOICES = (
(SERVICE_ENABLED, _("Enabled")),
(SERVICE_DISABLED, _("Disabled")),
)
class ServiceFilterAction(tables.FilterAction):
def filter(self, table, services, filter_string):
q = filter_string.lower()
@ -36,13 +45,10 @@ def get_stats(service):
{'service': service})
def get_status(service, reverse=False):
options = ["Enabled", "Disabled"]
if reverse:
options.reverse()
def get_status(service):
# if not configured in this region, neither option makes sense
if service.host:
return options[0] if not service.disabled else options[1]
return SERVICE_ENABLED if not service.disabled else SERVICE_DISABLED
return None
@ -53,7 +59,8 @@ class ServicesTable(tables.DataTable):
host = tables.Column('host', verbose_name=_('Host'))
status = tables.Column(get_status,
verbose_name=_('Status'),
status=True)
status=True,
display_choices=SERVICE_STATUS_DISPLAY_CHOICES)
class Meta:
name = "services"