diff --git a/openstack_dashboard/api/swift.py b/openstack_dashboard/api/swift.py index b262fb60a..e3a05fdca 100644 --- a/openstack_dashboard/api/swift.py +++ b/openstack_dashboard/api/swift.py @@ -141,7 +141,7 @@ def swift_get_containers(request, marker=None, prefix=None): headers, containers = swift_api(request).get_account(limit=limit + 1, marker=marker, prefix=prefix, - full_listing=True) + full_listing=False) container_objs = [Container(c) for c in containers] if(len(container_objs) > limit): return (container_objs[0:-1], True) @@ -221,7 +221,7 @@ def swift_get_objects(request, container_name, prefix=None, marker=None, marker=marker, limit=limit + 1, delimiter=FOLDER_DELIMITER, - full_listing=True) + full_listing=False) headers, objects = swift_api(request).get_container(container_name, **kwargs) object_objs = _objectify(objects, container_name) diff --git a/openstack_dashboard/test/api_tests/swift_tests.py b/openstack_dashboard/test/api_tests/swift_tests.py index 7b4670407..dcbc60233 100644 --- a/openstack_dashboard/test/api_tests/swift_tests.py +++ b/openstack_dashboard/test/api_tests/swift_tests.py @@ -34,7 +34,7 @@ class SwiftApiTests(test.APITestCase): swift_api.get_account(limit=1001, marker=None, prefix=None, - full_listing=True).AndReturn([{}, cont_data]) + full_listing=False).AndReturn([{}, cont_data]) self.mox.ReplayAll() (conts, more) = api.swift.swift_get_containers(self.request) @@ -116,7 +116,7 @@ class SwiftApiTests(test.APITestCase): marker=None, prefix=None, delimiter='/', - full_listing=True).AndReturn([{}, objects]) + full_listing=False).AndReturn([{}, objects]) self.mox.ReplayAll() (objs, more) = api.swift.swift_get_objects(self.request,