openstack
/
horizon
Code Issues Proposed changes

Merge "Made router detail status and admin state translatable"

This commit is contained in:
Jenkins 2015-09-09 14:55:22 +00:00 committed by Gerrit Code Review
parent 27ceba6035 210665a126
commit af617d2406
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstack_dashboard/dashboards/project/routers/templates/routers/_detail_overview.html
View File

@ -9,9 +9,9 @@
<dt>{% trans "Project ID" %}</dt>
<dd>{{ router.tenant_id }}</dd>
<dt>{% trans "Status" %}</dt>
<dd>{{ router.status|capfirst }}</dd>
<dd>{{ router.status_label|capfirst }}</dd>
<dt>{% trans "Admin State" %}</dt>
<dd>{{ router.admin_state|default:_("Unknown") }}</dd>
<dd>{{ router.admin_state_label|default:_("Unknown") }}</dd>
{% if dvr_supported %}
<dt>{% trans "Distributed" %}</dt>
<dd>{{ router.distributed|yesno|capfirst }}</dd>

15
openstack_dashboard/dashboards/project/routers/views.py
View File

@ -149,6 +149,21 @@ class DetailView(tabs.TabbedTableView):
self.request, "dvr", "get")
context['ha_supported'] = api.neutron.get_feature_permission(
self.request, "l3-ha", "get")
status_label = [label for (value, label) in
table.STATUS_DISPLAY_CHOICES
if value.lower() == (router.status or '').lower()]
if status_label:
router.status_label = status_label[0]
else:
router.status_label = router.status
admin_state_label = [state for (value, state) in
table.ADMIN_STATE_DISPLAY_CHOICES
if value.lower() ==
(router.admin_state or '').lower()]
if admin_state_label:
router.admin_state_label = admin_state_label[0]
else:
router.admin_state_label = router.admin_state
return context