summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorKaren Tracey <kmtracey@gmail.com>2009-12-12 22:02:55 +0000
committerKaren Tracey <kmtracey@gmail.com>2009-12-12 22:02:55 +0000
commit6c91e6ecbc10b32dd2c0f3f4e68d16647e4fb38d (patch)
tree049c403e6370980e607362f0b1f7d24b73fd67e6 /django
parent31618e3ea43b5bc17dd2a09be3d0631d4559f641 (diff)
[1.1.X] Fixed #12281: Added some helpful messages when Go is pressed in admin actions and there
is nothing to do because no action was selected or no items are selected. r11837 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11838 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-rw-r--r--django/contrib/admin/options.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index 6fa8f5c8dd..a230416152 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -689,6 +689,9 @@ class ModelAdmin(BaseModelAdmin):
# perform an action on it, so bail.
selected = request.POST.getlist(helpers.ACTION_CHECKBOX_NAME)
if not selected:
+ # Reminder that something needs to be selected or nothing will happen
+ msg = "Items must be selected in order to perform actions on them. No items have been changed."
+ self.message_user(request, _(msg))
return None
response = func(self, request, queryset.filter(pk__in=selected))
@@ -700,6 +703,9 @@ class ModelAdmin(BaseModelAdmin):
return response
else:
return HttpResponseRedirect(".")
+ else:
+ msg = "No action selected."
+ self.message_user(request, _(msg))
def add_view(self, request, form_url='', extra_context=None):
"The 'add' admin view for this model."