Ticket #12282: admin-selectacross.3.diff

django/contrib/admin/helpers.py

@@ -17 +17 @@
 
 class ActionForm(forms.Form):
     action = forms.ChoiceField(label=_('Action:'))
+    select_across = forms.BooleanField(label='', required=False, initial=0,
+        widget=forms.HiddenInput({'class': 'select-across'}))
 
 checkbox = forms.CheckboxInput({'class': 'action-select'}, lambda value: False)
 

django/contrib/admin/media/css/changelists.css

@@ -228 +228 @@
     border-right: 1px solid #ddd;
 }
 
-.action_counter{
-    font-size: 11px;
-    margin: 0 0.5em;
-    display: none;
-}
-
 #changelist table input {
     margin: 0;
 }
@@ -250 +244 @@
     background: white url(../img/admin/nav-bg-reverse.gif) 0 -10px repeat-x;
 }
 
+#changelist .actions.selected {
+    background: #fffccf;
+    border-top: 1px solid #fffee8;
+    border-bottom: 1px solid #edecd6;
+}
+
+#changelist .actions span.all,
+#changelist .actions span.action-counter,
+#changelist .actions span.clear,
+#changelist .actions span.question {
+    font-size: 11px;
+    margin: 0 0.5em;
+    display: none;
+}
+
 #changelist .actions:last-child {
     border-bottom: none;
 }

django/contrib/admin/media/js/actions.js

@@ -1 +1 @@
 var Actions = {
     init: function() {
         counterSpans = document.getElementsBySelector('span._acnt');
-        counterContainer = document.getElementsBySelector('span.action_counter');
+        counterContainer = document.getElementsBySelector('span.action-counter');
+        allContainer = document.getElementsBySelector('div.actions span.all');
+        actionContainer = document.getElementsBySelector('div.actions');
         actionCheckboxes = document.getElementsBySelector('tr input.action-select');
+        acrossInputs = document.getElementsBySelector('div.actions input.select-across');
+        acrossQuestions = document.getElementsBySelector('div.actions span.question');
+        acrossClears = document.getElementsBySelector('div.actions span.clear');
+        acrossQuestionLinks = document.getElementsBySelector('div.actions span.question a');
+        acrossClearsLinks = document.getElementsBySelector('div.actions span.clear a');
+
+        Actions.setDisplay(counterContainer, 'inline');
         selectAll = document.getElementById('action-toggle');
-        lastChecked = null;
-        for(var i = 0; i < counterContainer.length; i++) {
-            counterContainer[i].style.display = 'inline';
-        }
         if (selectAll) {
-            selectAll.style.display = 'inline';
+            Actions.setDisplay([selectAll], 'inline');
             addEvent(selectAll, 'click', function() {
                 Actions.checker(selectAll.checked);
                 Actions.counter();
             });
+            for(var i = 0; i < acrossQuestionLinks.length; i++) {
+                addEvent(acrossQuestionLinks[i], 'click', function() {
+                    Actions.setAcrossInputs(1);
+                    Actions.showClear()
+                    return false;
+                });
+            }
+            for(var i = 0; i < acrossClearsLinks.length; i++) {
+                addEvent(acrossClearsLinks[i], 'click', function() {
+                    selectAll.checked = false;
+                    Actions.clearAcross();
+                    Actions.checker(0);
+                    Actions.counter();
+                    return false;
+                });
+            }
         }
+        lastChecked = null;
         for(var i = 0; i < actionCheckboxes.length; i++) {
             addEvent(actionCheckboxes[i], 'click', function(e) {
                 if (!e) { var e = window.event; }
@@ -57 +79 @@
             tr.className = tr.className.replace(' selected', '');
         }  
     },
-    checked: function() {
-        selectAll.checked = false;
+    setAcrossInputs: function(checked) {
+        for(var i = 0; i < acrossInputs.length; i++) {
+            acrossInputs[i].value = checked;
+        }
     },
     checker: function(checked) {
+        if (checked) {
+            Actions.showQuestion()
+        } else {
+            Actions.reset();
+        }
         for(var i = 0; i < actionCheckboxes.length; i++) {
             actionCheckboxes[i].checked = checked;
             Actions.toggleRow(actionCheckboxes[i].parentNode.parentNode, checked);
         }
     },
+    setDisplay: function(elements, value) {
+        for(var i = 0; i < elements.length; i++) {
+            elements[i].style.display = value;
+        }
+    },
+    showQuestion: function() {
+        Actions.setDisplay(acrossQuestions, 'inline');
+        Actions.setDisplay(acrossClears, 'none');
+        Actions.setDisplay(allContainer, 'none');
+    },
+    showClear: function() {
+        Actions.setDisplay(acrossQuestions, 'none');
+        Actions.setDisplay(acrossClears, 'inline');
+        Actions.setDisplay(counterContainer, 'none');
+        Actions.setDisplay(allContainer, 'inline');
+        for(var i = 0; i < actionContainer.length; i++) {
+            Actions.toggleRow(actionContainer[i], true)
+        }
+    },
+    reset: function() {
+        Actions.setDisplay(allContainer, 'none')
+        Actions.setDisplay(acrossQuestions, 'none');
+        Actions.setDisplay(acrossClears, 'none');
+        Actions.setDisplay(counterContainer, 'inline');
+    },
+    clearAcross: function() {
+        Actions.reset()
+        Actions.setAcrossInputs(0);
+        for(var i = 0; i < actionContainer.length; i++) {
+            Actions.toggleRow(actionContainer[i], false)
+        }
+    },
     counter: function() {
         counter = 0;
         for(var i = 0; i < actionCheckboxes.length; i++) {
@@ -76 +137 @@
         for(var i = 0; i < counterSpans.length; i++) {
             counterSpans[i].innerHTML = counter;
         }
-        selectAll.checked = (counter == actionCheckboxes.length);
+        if (counter == actionCheckboxes.length) {
+            selectAll.checked = true;
+            Actions.showQuestion()
+        } else {
+            selectAll.checked = false;
+            Actions.clearAcross()
+        }
     }
 };
 

django/contrib/admin/options.py

@@ -719 +719 @@
         # If the form's valid we can handle the action.
         if action_form.is_valid():
             action = action_form.cleaned_data['action']
+            select_across = action_form.cleaned_data['select_across']
             func, name, description = 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.
+            # perform an action on it, so bail. Except we want to perform
+            # the action explicitely on all objects.
             selected = request.POST.getlist(helpers.ACTION_CHECKBOX_NAME)
-            if not selected:
+            if not selected and not select_across:
                 # 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))
+            if not select_across:
+                # Perform the action only on the selected objects
+                queryset = queryset.filter(pk__in=selected)
+
+            response = func(self, request, queryset)
 
             # Actions may return an HttpResponse, which will be used as the
             # response from the POST. If not, we'll be a good little HTTP

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 %}
+    {% for field in action_form %}{% if field.label %}<label>{{ field.label }} {% endif %}{{ field }}{% if field.label %}</label>{% endif %}{% endfor %}
     <button type="submit" class="button" title="{% trans "Run the selected action" %}" name="index" value="{{ action_index|default:0 }}">{% trans "Go" %}</button>
     {% if actions_selection_counter %}
-    <span class="action_counter">
-      {% blocktrans with cl.result_count as total_count %}<span class="_acnt">0</span> of {{ total_count }} {{ module_name }} selected{% endblocktrans %}
-    </span>
+        <span class="action-counter">
+            {% blocktrans with cl.result_count as total_count %}
+            <span class="_acnt">0</span> of {{ total_count }} {{ module_name }} selected
+            {% endblocktrans %}
+        </span>
+        {% if cl.result_count != cl.result_list|length %}
+        <span class="all">
+            {% blocktrans with cl.result_count as total_count %}
+            All {{ total_count }} {{ module_name }} selected
+            {% endblocktrans %}
+        </span>
+        <span class="question">
+            <a href="javascript:;" title="{% trans "Click here to select all objects across all pages" %}">
+                {% blocktrans with cl.result_count as total_count %}
+                    Select all {{ total_count }} {{ module_name }}
+                {% endblocktrans %}
+            </a>
+        </span>
+        <span class="clear"><a href="javascript:;">{% trans "Clear selection" %}</a></span>
+        {% endif %}
     {% endif %}
 </div>
+