2 files changed, 36 insertions, 3 deletions
diff --git a/tests/regressiontests/admin_views/models.py b/tests/regressiontests/admin_views/models.py
index 74fc7ecf78..75b4ad2c87 100644
--- a/tests/regressiontests/admin_views/models.py
+++ b/tests/regressiontests/admin_views/models.py
@@ -223,7 +223,7 @@ class Subscriber(models.Model):
         return "%s (%s)" % (self.name, self.email)
 
 class SubscriberAdmin(admin.ModelAdmin):
-    actions = ['delete_selected', 'mail_admin']
+    actions = ['mail_admin']
 
     def mail_admin(self, request, selected):
         EmailMessage(
@@ -236,7 +236,10 @@ class SubscriberAdmin(admin.ModelAdmin):
 class ExternalSubscriber(Subscriber):
     pass
 
-def external_mail(request, selected):
+class OldSubscriber(Subscriber):
+    pass
+
+def external_mail(modeladmin, request, selected):
     EmailMessage(
         'Greetings from a function action',
         'This is the test email from a function action',
@@ -244,7 +247,7 @@ def external_mail(request, selected):
         ['to@example.com']
     ).send()
 
-def redirect_to(request, selected):
+def redirect_to(modeladmin, request, selected):
     from django.http import HttpResponseRedirect
     return HttpResponseRedirect('/some-where-else/')
 
@@ -285,6 +288,9 @@ class EmptyModelAdmin(admin.ModelAdmin):
     def queryset(self, request):
         return super(EmptyModelAdmin, self).queryset(request).filter(pk__gt=1)
 
+class OldSubscriberAdmin(admin.ModelAdmin):
+    actions = None
+
 admin.site.register(Article, ArticleAdmin)
 admin.site.register(CustomArticle, CustomArticleAdmin)
 admin.site.register(Section, save_as=True, inlines=[ArticleInline])
@@ -295,6 +301,7 @@ admin.site.register(Person, PersonAdmin)
 admin.site.register(Persona, PersonaAdmin)
 admin.site.register(Subscriber, SubscriberAdmin)
 admin.site.register(ExternalSubscriber, ExternalSubscriberAdmin)
+admin.site.register(OldSubscriber, OldSubscriberAdmin)
 admin.site.register(Podcast, PodcastAdmin)
 admin.site.register(Parent, ParentAdmin)
 admin.site.register(EmptyModel, EmptyModelAdmin)
diff --git a/tests/regressiontests/admin_views/tests.py b/tests/regressiontests/admin_views/tests.py
index 7c54c73346..d7bce8fdcd 100644
--- a/tests/regressiontests/admin_views/tests.py
+++ b/tests/regressiontests/admin_views/tests.py
@@ -995,6 +995,32 @@ class AdminActionsTest(TestCase):
         }
         response = self.client.post('/test_admin/admin/admin_views/externalsubscriber/', action_data)
         self.failUnlessEqual(response.status_code, 302)
+        
+    def test_model_without_action(self):
+        "Tests a ModelAdmin without any action"
+        response = self.client.get('/test_admin/admin/admin_views/oldsubscriber/')
+        self.assertEquals(response.context["action_form"], None)
+        self.assert_(
+            '<input type="checkbox" class="action-select"' not in response.content,
+            "Found an unexpected action toggle checkboxbox in response"
+        )
+        
+    def test_multiple_actions_form(self):
+        """
+        Test that actions come from the form whose submit button was pressed (#10618).
+        """
+        action_data = {
+            ACTION_CHECKBOX_NAME: [1],
+            # Two different actions selected on the two forms...
+            'action': ['external_mail', 'delete_selected'],
+            # ...but we clicked "go" on the top form.
+            'index': 0
+        }
+        response = self.client.post('/test_admin/admin/admin_views/externalsubscriber/', action_data)
+
+        # Send mail, don't delete.
+        self.assertEquals(len(mail.outbox), 1)
+        self.assertEquals(mail.outbox[0].subject, 'Greetings from a function action')
 
 class TestInlineNotEditable(TestCase):
     fixtures = ['admin-views-users.xml']