Fixes behavior for prefixs that matches no objects.

Previously would populate object list with all objects in container if
the prefix didn't match any object.
This commit is contained in:
Mark Gius
2011-07-18 13:49:09 -07:00
parent d7215d0ce0
commit 9ee77930b1
2 changed files with 10 additions and 4 deletions

View File

@@ -48,6 +48,11 @@ class FilterObjects(forms.SelfHandlingForm):
data['container_name'],
prefix=object_prefix)
if not objects:
messages.info(request,
'There are no objects matching that prefix in %s' %
data['container_name'])
return objects
@@ -122,7 +127,8 @@ def index(request, tenant_id, container_name):
return handled
filter_form, objects = FilterObjects.maybe_handle(request)
if not objects:
if objects is None:
filter_form.fields['container_name'].initial = container_name
objects = api.swift_get_objects(request, container_name)

View File

@@ -93,8 +93,8 @@ class ContainerViewTests(base.BaseViewTests):
messages.success(IgnoreArg(), IsA(str))
res = self.client.post(reverse('dash_containers_create',
args=['tenant']),
args=[self.request.user.tenant]),
formData)
self.assertRedirectsNoFollow(res, reverse('dash_containers_create',
args=['tenant']))
self.assertRedirectsNoFollow(res, reverse('dash_containers',
args=[self.request.user.tenant]))