openstack
/
horizon
Code Issues Proposed changes

Merge "corrected the wrong url in admin instance detail"

This commit is contained in:
Jenkins 2015-07-07 14:05:37 +00:00 committed by Gerrit Code Review
parent 653f85444f 2d8a4c6bc7
commit a385be24f5
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,6 +194,7 @@ class LiveMigrateView(forms.ModalFormView):
class DetailView(views.DetailView):
redirect_url = 'horizon:admin:instances:index'
image_url = 'horizon:admin:images:detail'
volume_url = 'horizon:admin:volumes:volumes:detail'
def _get_actions(self, instance):
table = project_tables.AdminInstancesTable(self.request)

2
openstack_dashboard/dashboards/project/instances/templates/instances/_detail_overview.html
View File

@ -137,7 +137,7 @@
{% for volume in instance.volumes %}
<dt>{% trans "Attached To" %}</dt>
<dd>
{% url 'horizon:project:volumes:volumes:detail' volume.id as volume_url %}
{% url instance.volume_url volume.id as volume_url %}
{% blocktrans with volume_label=volume.name|default:volume.id volume_device=volume.device %}
<a href="{{ volume_url }}">{{ volume_label }}</a> on {{ volume_device }}
{% endblocktrans %}

2
openstack_dashboard/dashboards/project/instances/views.py
View File

@ -293,6 +293,7 @@ class DetailView(tabs.TabView):
redirect_url = 'horizon:project:instances:index'
page_title = _("Instance Details: {{ instance.name }}")
image_url = 'horizon:project:images:images:detail'
volume_url = 'horizon:project:volumes:volumes:detail'
def get_context_data(self, **kwargs):
context = super(DetailView, self).get_context_data(**kwargs)
@ -300,6 +301,7 @@ class DetailView(tabs.TabView):
if instance.image:
instance.image_url = reverse(self.image_url,
args=[instance.image['id']])
instance.volume_url = self.volume_url
context["instance"] = instance
context["url"] = reverse(self.redirect_url)
context["actions"] = self._get_actions(instance)