Ticket #10871: admin-action-input.patch

django/contrib/admin/options.py

@@ -443 +443 @@
         # Gather actions from the admin site first
         for (name, func) in self.admin_site.actions:
             description = getattr(func, 'short_description', name.replace('_', ' '))
-            actions.append((func, name, description))
+            takes_input = hasattr(func, 'takes_input') and getattr(func, 'takes_input') or False
+            actions.append((func, name, description, takes_input))
         
         # Then gather them from the model admin and all parent classes, 
         # starting with self and working back up.
@@ -461 +462 @@
         # and sorted by description.
         actions.sort(lambda a,b: cmp(a[2].lower(), b[2].lower()))
         actions = SortedDict([
-            (name, (func, name, desc))
-            for func, name, desc in actions
+            (name, (func, name, desc, input))
+            for func, name, desc, input in actions
         ])
         
         return actions
@@ -473 +474 @@
         tuple (name, description).
         """
         choices = [] + default_choices
-        for func, name, description in self.get_actions(request).itervalues():
+        for func, name, description, takes_input in self.get_actions(request).itervalues():
             choice = (name, description % model_format_dict(self.opts))
             choices.append(choice)
         return choices
 
     def get_action(self, action):
         """
-        Return a given action from a parameter, which can either be a calable,
+        Return a given action from a parameter, which can either be a callable,
         or the name of a method on the ModelAdmin.  Return is a tuple of
         (callable, name, description).
         """
@@ -506 +507 @@
             description = func.short_description
         else:
             description = capfirst(action.replace('_', ' '))
-        return func, action, description
+        
+        takes_input = hasattr(func, 'takes_input') and getattr(func, 'takes_input') or False
+        
+        return func, action, description, takes_input
 
     def construct_change_message(self, request, form, formsets):
         """
@@ -680 +684 @@
         # If the form's valid we can handle the action.
         if action_form.is_valid():
             action = action_form.cleaned_data['action']
-            func, name, description = self.get_actions(request)[action]
+            func, name, description, takes_input = self.get_actions(request)[action]
 
             # Get the list of selected PKs. If nothing's selected, we can't
             # perform an action on it, so bail.
             selected = request.POST.getlist(helpers.ACTION_CHECKBOX_NAME)
             if not selected:
                 return None
+            
+            input = takes_input and [request.POST["actioninput"]] or []
+            response = func(self, request, queryset.filter(pk__in=selected), *input)
 
-            response = func(self, request, queryset.filter(pk__in=selected))
-
             # Actions may return an HttpResponse, which will be used as the
             # response from the POST. If not, we'll be a good little HTTP
             # citizen and redirect back to the changelist page.

django/contrib/admin/templates/admin/actions.html

@@ -1 +1 @@
 {% load i18n %}
 <div class="actions">
     {% for field in action_form %}<label>{{ field.label }} {{ field }}</label>{% endfor %}
+    <input type="text" id="actioninput" value="" name="actioninput" size="20"/>
     <button type="submit" class="button" title="{% trans "Run the selected action" %}" name="index" value="{{ action_index|default:0 }}">{% trans "Go" %}</button>
 </div>