Ticket #33977: django-actions.patch

django/contrib/admin/decorators.py

@@ -1 @@
-def action(function=None, *, permissions=None, description=None):
+def action(function=None, *, permissions=None, description=None, group=None):
     """
     Conveniently add attributes to an action function::
 
@@ -23 +23 @@
             func.allowed_permissions = permissions
         if description is not None:
             func.short_description = description
+        if group is not None:
+            func.action_group = group
         return func
 
     if function is None:

django/contrib/admin/options.py

@@ -1 +1 @@
 import copy
+from collections import defaultdict
 import json
 import re
 from functools import partial, update_wrapper
@@ -1024 +1025 @@
         Return a list of choices for use in a form object.  Each choice is a
         tuple (name, description).
         """
+        choices = defaultdict(list)
+        choices[None].extend(default_choices)
         choices = [] + default_choices
         for func, name, description in self.get_actions(request).values():
             choice = (name, description % model_format_dict(self.opts))
-            choices.append(choice)
-        return choices
+            choices[getattr(func, 'action_group', None)].append(choice)
+        return list(choices.items())
 
     def get_action(self, action):
         """