Hopiu/django-admin2
1
0
Fork 0
mirror of https://github.com/jazzband/django-admin2.git synced 2026-04-25 09:04:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'drop_down_fires_nothing_selected' of git://github.com/waustin/django-admin2 into waustin-drop_down_fires_nothing_selected

Browse source
This commit is contained in:
Daniel Greenfeld 2013-06-04 11:21:07 +02:00
commit b7feb5f284
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
djadmin2/actions.py
View file

@ -35,7 +35,12 @@ class BaseListAction(object):
self.permission_name = '%s.delete.%s' \
% (self.options.app_label, self.options.object_name.lower())
self.has_permission = request.user.has_perm(self.permission_name)
if queryset.count() == 1:
self.item_count = queryset.count()
if self.item_count == 0:
objects_name = self.options.verbose_name
elif self.item_count == 1:
objects_name = self.options.verbose_name
else:
objects_name = self.options.verbose_name_plural
@ -51,7 +56,12 @@ class BaseListAction(object):
return NotImplemented
def __call__(self):
return self.get_response()
if self.item_count > 0:
return self.get_response()
else:
message = _("Items must be selected in order to perform actions on them. No items have been changed.")
messages.add_message(self.request, messages.INFO, message)
return None
class DeleteSelectedAction(BaseListAction):

6
example/blog/tests/test_views.py
View file

@ -46,6 +46,12 @@ class PostListTest(BaseIntegrationTest):
response = self.client.post(reverse("admin2:blog_post_index"), params)
self.assertRedirects(response, reverse("admin2:blog_post_index"))
def test_delete_selected_post_none_selected(self):
post = Post.objects.create(title="a_post_title", body="body")
params = {'action': 'DeleteSelectedAction'}
response = self.client.post(reverse("admin2:blog_post_index"), params)
self.assertInHTML("Items must be selected in order to perform actions on them. No items have been changed.")
class PostDetailViewTest(BaseIntegrationTest):
def test_view_ok(self):