Merge "Always return a list from VolumeTableMixIn._get*"
This commit is contained in:
commit
9be678c189
@ -47,6 +47,7 @@ class VolumeTableMixIn(object):
|
|||||||
except:
|
except:
|
||||||
exceptions.handle(self.request,
|
exceptions.handle(self.request,
|
||||||
_('Unable to retrieve volume list.'))
|
_('Unable to retrieve volume list.'))
|
||||||
|
return []
|
||||||
|
|
||||||
def _get_instances(self):
|
def _get_instances(self):
|
||||||
try:
|
try:
|
||||||
@ -56,6 +57,7 @@ class VolumeTableMixIn(object):
|
|||||||
exceptions.handle(self.request,
|
exceptions.handle(self.request,
|
||||||
_("Unable to retrieve volume/instance "
|
_("Unable to retrieve volume/instance "
|
||||||
"attachment information"))
|
"attachment information"))
|
||||||
|
return []
|
||||||
|
|
||||||
def _set_id_if_nameless(self, volumes, instances):
|
def _set_id_if_nameless(self, volumes, instances):
|
||||||
for volume in volumes:
|
for volume in volumes:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user