← Back to branch summary

~ubuntu-branches/ubuntu/vivid/horizon/vivid-proposed

« back to all changes in this revision

Viewing changes to openstack_dashboard/dashboards/project/routers/extensions/routerrules/tabs.py

  • Committer: Package Import Robot
  • Author(s): Corey Bryant, Corey Bryant, James Page
  • Date: 2015-02-16 13:50:29 UTC
  • mfrom: (0.10.1) (1.2.6)
  • Revision ID: package-import@ubuntu.com-20150216135029-m632ppq5etw9te0c
Tags: 1:2015.1~b2-0ubuntu1
[ Corey Bryant ]
* New upstream release.
  - d/control: Align with upstream dependencies.
  - d/p/embedded-xstatic.patch: Refreshed. Code moved to new files.
  - d/p/fix-requirements.patch: Added to drop selenium dependency.

[ James Page ]
* d/bundle-xstatic.sh: Use --system flag when generating xstatic
  assets.

Show diffs side-by-side

added added

removed removed

Lines of Context:
openstack_dashboard/dashboards/project/routers/extensions/routerrules/tabs.py
85
85
        ports = self.tab_group.ports
86
86
        networks = api.neutron.network_list_for_tenant(
87
87
            self.request, self.request.user.tenant_id)
88
 
        for n in networks:
89
 
            n.set_id_as_name_if_empty()
90
88
        netnamemap = {}
91
89
        subnetmap = {}
92
90
        for n in networks:
93
 
            netnamemap[n['id']] = n['name']
 
91
            netnamemap[n['id']] = n.name_or_id
94
92
            for s in n.subnets:
95
93
                subnetmap[s.id] = {'name': s.name,
96
94
                                   'cidr': s.cidr}