Browse files

Fixed #12962: Made admin delete action work again. Thanks ptone, skev…

…y, mlavin and anyone else I've missed.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12813 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 4f98a7c commit 4528f3988689272d511b1395efc578c0b0d9e671 @kmtracey kmtracey committed Mar 20, 2010
Showing with 3 additions and 8 deletions.
  1. +3 −7 django/contrib/admin/options.py
  2. +0 −1 tests/regressiontests/admin_views/tests.py
View
10 django/contrib/admin/options.py
@@ -698,10 +698,6 @@ def response_action(self, request, queryset):
changelist; it returns an HttpResponse if the action was handled, and
None otherwise.
"""
- if 'index' not in request.POST:
- # If "Go" was not pushed then we can assume the POST was for
- # an inline edit save and we do not need to validate the form.
- return None
# There can be multiple action forms on the page (at the top
# and bottom of the change list, for example). Get the action
@@ -978,9 +974,9 @@ def changelist_view(self, request, extra_context=None):
return HttpResponseRedirect(request.path + '?' + ERROR_FLAG + '=1')
# If the request was POSTed, this might be a bulk action or a bulk edit.
- # Try to look up an action first, but if this isn't an action the POST
- # will fall through to the bulk edit check, below.
- if actions and request.method == 'POST':
+ # Try to look up an action or confirmation first, but if this isn't an
+ # action the POST will fall through to the bulk edit check, below.
+ if actions and request.method == 'POST' and (helpers.ACTION_CHECKBOX_NAME in request.POST or 'index' in request.POST):
response = self.response_action(request, queryset=cl.get_query_set())
if response:
return response
View
1 tests/regressiontests/admin_views/tests.py
@@ -1340,7 +1340,6 @@ def test_model_admin_default_delete_action(self):
delete_confirmation_data = {
ACTION_CHECKBOX_NAME: [1, 2],
'action' : 'delete_selected',
- 'index': 0,
'post': 'yes',
}
confirmation = self.client.post('/test_admin/admin/admin_views/subscriber/', action_data)

0 comments on commit 4528f39

Please sign in to comment.