From 118eabf049db8804635001b2348fcb81c8a2a4f4 Mon Sep 17 00:00:00 2001 From: tinytmy Date: Mon, 9 Feb 2015 14:49:32 +0800 Subject: [PATCH] Fix router details's name empty and change inheritance project table In admin router details page, the name column is empty, change to if no name show id. And change to inheritance from port table of project. Change-Id: I54d4ad95bd04db2432eb47f848917a452c5f54e9 Closes-bug:#1417948 --- .../dashboards/admin/routers/ports/tables.py | 24 ++----------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/openstack_dashboard/dashboards/admin/routers/ports/tables.py b/openstack_dashboard/dashboards/admin/routers/ports/tables.py index c17f36ff2b..c093a5de6e 100644 --- a/openstack_dashboard/dashboards/admin/routers/ports/tables.py +++ b/openstack_dashboard/dashboards/admin/routers/ports/tables.py @@ -12,37 +12,17 @@ # License for the specific language governing permissions and limitations # under the License. -from django.utils.translation import pgettext_lazy from django.utils.translation import ugettext_lazy as _ from horizon import tables -from openstack_dashboard.dashboards.project.networks.ports \ - import tables as networks_tables from openstack_dashboard.dashboards.project.routers.ports \ import tables as routers_tables -DISPLAY_CHOICES = ( - ("UP", pgettext_lazy("Admin state of a Network", u"UP")), - ("DOWN", pgettext_lazy("Admin state of a Network", u"DOWN")), -) - - -class PortsTable(tables.DataTable): - name = tables.Column("name", +class PortsTable(routers_tables.PortsTable): + name = tables.Column("name_or_id", verbose_name=_("Name"), link="horizon:admin:networks:ports:detail") - fixed_ips = tables.Column(networks_tables.get_fixed_ips, - verbose_name=_("Fixed IPs")) - status = tables.Column("status", verbose_name=_("Status")) - device_owner = tables.Column(routers_tables.get_device_owner, - verbose_name=_("Type")) - admin_state = tables.Column("admin_state", - verbose_name=_("Admin State"), - display_choices=DISPLAY_CHOICES) - - def get_object_display(self, port): - return port.id class Meta(object): name = "interfaces"