openstack/horizon
Code Issues Proposed changes

Merge "wrong message while deleting non empty pseudo folder"

Browse Source
This commit is contained in:
Jenkins 2014-12-09 09:37:28 +00:00 committed by Gerrit Code Review
commit 8f2903ed2c
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
openstack_dashboard/api/swift.py
View File

@ -200,8 +200,8 @@ def swift_delete_container(request, name):
# be done in swiftclient instead of Horizon.
objects, more = swift_get_objects(request, name)
if objects:
error_msg = unicode(_("The container cannot be deleted "
"since it's not empty."))
error_msg = _("The container cannot be deleted "
"since it is not empty.")
exc = exceptions.Conflict(error_msg)
exc._safe_message = error_msg
raise exc
@ -307,6 +307,21 @@ def swift_create_pseudo_folder(request, container_name, pseudo_folder_name):
def swift_delete_object(request, container_name, object_name):
objects, more = swift_get_objects(request, container_name,
prefix=object_name)
# In case the given object is pseudo folder,
# it can be deleted only if it is empty.
# swift_get_objects will return at least
# one object (i.e container_name) even if the
# given pseudo folder is empty. So if swift_get_objects
# returns more than one object then only it will be
# considered as non empty folder.
if len(objects) > 1:
error_msg = _("The pseudo folder cannot be deleted "
"since it is not empty.")
exc = exceptions.Conflict(error_msg)
exc._safe_message = error_msg
raise exc
swift_api(request).delete_object(container_name, object_name)
return True

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

@ -114,7 +114,7 @@ class SwiftTests(test.TestCase):
self.assertEqual(unicode(list(req._messages)[0].message),
u"The container cannot be deleted "
u"since it's not empty.")
u"since it is not empty.")
def test_create_container_get(self):
res = self.client.get(reverse('horizon:project:containers:create'))