openstack
/
horizon
Code Issues Proposed changes

Corrected wrong url in router detail page 

In router detail page, the link to the network detail page
redirecting to admins panel. so the non admin users not
able to access the network detail page from router detail page.

Change-Id: If6d70dcb214b9557d8501b9252b75fbfd9add248
Closes-Bug: #1504123
This commit is contained in:
Masco Kaliyamoorthy 2015-10-08 18:52:22 +05:30
parent 2f24514433
commit ffae6e6757
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,6 +62,7 @@ class DetailView(r_views.DetailView):
tab_group_class = rtabs.RouterDetailTabs
template_name = 'admin/routers/detail.html'
failure_url = reverse_lazy('horizon:admin:routers:index')
network_url = 'horizon:admin:networks:detail'
def get_context_data(self, **kwargs):
context = super(DetailView, self).get_context_data(**kwargs)

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

@ -28,9 +28,8 @@
<dl class="dl-horizontal">
<dt>{% trans "Network Name" %}</dt>
<dd>{{ router.external_gateway_info.network|default:_("None") }}</dd>
{% url 'horizon:admin:networks:detail' router.external_gateway_info.network_id as network_url %}
<dt>{% trans "Network ID" %}</dt>
<dd><a href="{{ network_url }}">{{ router.external_gateway_info.network_id|default:_("Unknown") }}</a></dd>
<dd><a href="{{ router.external_gateway_info.network_url }}">{{ router.external_gateway_info.network_id|default:_("Unknown") }}</a></dd>
<dt>{% trans "External Fixed IPs" %}</dt>
<dd>
<ul>

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

@ -100,6 +100,7 @@ class DetailView(tabs.TabbedTableView):
tab_group_class = rdtabs.RouterDetailTabs
template_name = 'project/routers/detail.html'
failure_url = reverse_lazy('horizon:project:routers:index')
network_url = 'horizon:project:networks:detail'
page_title = _("Router Details")
@memoized.memoized_method
@ -114,6 +115,8 @@ class DetailView(tabs.TabbedTableView):
exceptions.handle(self.request, msg, redirect=self.failure_url)
if router.external_gateway_info:
ext_net_id = router.external_gateway_info['network_id']
router.external_gateway_info['network_url'] = reverse(
self.network_url, args=[ext_net_id])
try:
ext_net = api.neutron.network_get(self.request, ext_net_id,
expand_subnet=False)