openstack
/
horizon
Code Issues Proposed changes

Merge "Fix AttributeError in project/admin snapshot detail page"

This commit is contained in:
Jenkins 2017-06-07 17:02:53 +00:00 committed by Gerrit Code Review
parent c9f073930b a27753153b
commit 1eaa564098
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack_dashboard/dashboards/admin/snapshots/tests.py
View File

@ -167,6 +167,8 @@ class VolumeSnapshotsViewTests(test.BaseAdminViewTests):
AndReturn(volume)
cinder.volume_snapshot_get(IsA(http.HttpRequest), snapshot.id). \
AndReturn(snapshot)
cinder.volume_get(IsA(http.HttpRequest), snapshot.volume_id). \
AndReturn(volume)
self.mox.ReplayAll()

2
openstack_dashboard/dashboards/project/snapshots/tests.py
View File

@ -228,6 +228,8 @@ class VolumeSnapshotsViewTests(test.TestCase):
AndReturn(volume)
api.cinder.volume_snapshot_get(IsA(http.HttpRequest), snapshot.id). \
AndReturn(snapshot)
api.cinder.volume_get(IsA(http.HttpRequest), snapshot.volume_id). \
AndReturn(volume)
self.mox.ReplayAll()

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

@ -115,6 +115,8 @@ class DetailView(tabs.TabView):
snapshot_id = self.kwargs['snapshot_id']
snapshot = api.cinder.volume_snapshot_get(self.request,
snapshot_id)
snapshot._volume = api.cinder.volume_get(self.request,
snapshot.volume_id)
except Exception:
redirect = self.get_redirect_url()
exceptions.handle(self.request,