Merge "Always return a list from VolumeTableMixIn._get*"

2013-05-22 07:58:14 +00:00 · 2013-05-22 07:58:14 +00:00 · 9be678c189
commit 9be678c189
parent 7ab166cfa6 decee66cb4
1 changed files with 2 additions and 0 deletions
--- a/openstack_dashboard/dashboards/project/volumes/views.py
+++ b/openstack_dashboard/dashboards/project/volumes/views.py
@ -47,6 +47,7 @@ class VolumeTableMixIn(object):
        except:
            exceptions.handle(self.request,
                              _('Unable to retrieve volume list.'))
+            return []

    def _get_instances(self):
        try:
@ -56,6 +57,7 @@ class VolumeTableMixIn(object):
            exceptions.handle(self.request,
                              _("Unable to retrieve volume/instance "
                                "attachment information"))
+            return []

    def _set_id_if_nameless(self, volumes, instances):
        for volume in volumes: