openstack/horizon
Code Issues Proposed changes

Merge "Replace set_id_as_name_if_empty with name_or_id"

Browse Source
This commit is contained in:
Jenkins
2014-12-22 16:14:46 +00:00
committed by Gerrit Code Review
parent f253065556 403b81db29
commit 15b9b8d064
28 changed files with 41 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openstack_dashboard/dashboards/admin/networks/ports/tables.py
View File

@@ -94,7 +94,7 @@ DISPLAY_CHOICES = (
class PortsTable(tables.DataTable):
name = tables.Column("name",
name = tables.Column("name_or_id",
verbose_name=_("Name"),
link="horizon:admin:networks:ports:detail")
fixed_ips = tables.Column(

2
openstack_dashboard/dashboards/admin/networks/subnets/tables.py
View File

@@ -89,7 +89,7 @@ class UpdateSubnet(proj_tables.SubnetPolicyTargetMixin, tables.LinkAction):
class SubnetsTable(tables.DataTable):
name = tables.Column("name", verbose_name=_("Name"),
name = tables.Column("name_or_id", verbose_name=_("Name"),
link='horizon:admin:networks:subnets:detail')
cidr = tables.Column("cidr", verbose_name=_("CIDR"))
ip_version = tables.Column("ipver_str", verbose_name=_("IP Version"))

2
openstack_dashboard/dashboards/admin/networks/tables.py
View File

@@ -91,7 +91,7 @@ DISPLAY_CHOICES = (
class NetworksTable(tables.DataTable):
tenant = tables.Column("tenant_name", verbose_name=_("Project"))
name = tables.Column("name", verbose_name=_("Network Name"),
name = tables.Column("name_or_id", verbose_name=_("Network Name"),
link='horizon:admin:networks:detail')
subnets = tables.Column(project_tables.get_subnets,
verbose_name=_("Subnets Associated"),)

6
openstack_dashboard/dashboards/admin/networks/views.py
View File

@@ -82,8 +82,6 @@ class IndexView(tables.DataTableView):
# Set tenant name
tenant = tenant_dict.get(n.tenant_id, None)
n.tenant_name = getattr(tenant, 'name', None)
# If name is empty use UUID as name
n.set_id_as_name_if_empty()
n.num_agents = self._get_agents_data(n.id)
if self.exception:
@@ -113,8 +111,6 @@ class DetailView(tables.MultiTableView):
subnets = []
msg = _('Subnet list can not be retrieved.')
exceptions.handle(self.request, msg)
for s in subnets:
s.set_id_as_name_if_empty()
return subnets
def get_ports_data(self):
@@ -125,8 +121,6 @@ class DetailView(tables.MultiTableView):
ports = []
msg = _('Port list can not be retrieved.')
exceptions.handle(self.request, msg)
for p in ports:
p.set_id_as_name_if_empty()
return ports
def get_agents_data(self):

2
openstack_dashboard/dashboards/admin/routers/views.py
View File

@@ -48,7 +48,7 @@ class IndexView(r_views.IndexView, n_views.IndexView):
tenant = tenant_dict.get(r.tenant_id, None)
r.tenant_name = getattr(tenant, 'name', None)
# If name is empty use UUID as name
r.set_id_as_name_if_empty()
r.name = r.name_or_id
# Set external network name
self._set_external_network(r, ext_net_dict)
return routers