Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #12282 - When paginated allow selecting all items in the admin …

…changlist.

Thanks to Martin Mahner, Rob Hudson and Zain Memon for providing inital patches and guidance.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12298 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit f109f36a06c362f3a2f698648a9cc3917abbfccd 1 parent c14937c
@jezdez jezdez authored
View
2  django/contrib/admin/helpers.py
@@ -17,6 +17,8 @@
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)
View
21 django/contrib/admin/media/css/changelists.css
@@ -228,12 +228,6 @@
border-right: 1px solid #ddd;
}
-.action_counter{
- font-size: 11px;
- margin: 0 0.5em;
- display: none;
-}
-
#changelist table input {
margin: 0;
}
@@ -250,6 +244,21 @@
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;
}
View
194 django/contrib/admin/media/js/actions.js
@@ -1,83 +1,111 @@
-var Actions = {
- init: function() {
- counterSpans = document.getElementsBySelector('span._acnt');
- counterContainer = document.getElementsBySelector('span.action_counter');
- actionCheckboxes = document.getElementsBySelector('tr input.action-select');
- 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';
- addEvent(selectAll, 'click', function() {
- Actions.checker(selectAll.checked);
- Actions.counter();
- });
- }
- for(var i = 0; i < actionCheckboxes.length; i++) {
- addEvent(actionCheckboxes[i], 'click', function(e) {
- if (!e) { var e = window.event; }
- var target = e.target ? e.target : e.srcElement;
- if (lastChecked && lastChecked != target && e.shiftKey == true) {
- var inrange = false;
- lastChecked.checked = target.checked;
- Actions.toggleRow(lastChecked.parentNode.parentNode, target.checked);
- for (var i = 0; i < actionCheckboxes.length; i++) {
- if (actionCheckboxes[i] == lastChecked || actionCheckboxes[i] == target) {
- inrange = (inrange) ? false : true;
- }
- if (inrange) {
- actionCheckboxes[i].checked = target.checked;
- Actions.toggleRow(actionCheckboxes[i].parentNode.parentNode, target.checked);
- }
- }
- }
- lastChecked = target;
- Actions.counter();
- });
- }
- var changelistTable = document.getElementsBySelector('#changelist table')[0];
- if (changelistTable) {
- addEvent(changelistTable, 'click', function(e) {
- if (!e) { var e = window.event; }
- var target = e.target ? e.target : e.srcElement;
- if (target.nodeType == 3) { target = target.parentNode; }
- if (target.className == 'action-select') {
- var tr = target.parentNode.parentNode;
- Actions.toggleRow(tr, target.checked);
- }
- });
- }
- },
- toggleRow: function(tr, checked) {
- if (checked && tr.className.indexOf('selected') == -1) {
- tr.className += ' selected';
- } else if (!checked) {
- tr.className = tr.className.replace(' selected', '');
- }
- },
- checked: function() {
- selectAll.checked = false;
- },
- checker: function(checked) {
- for(var i = 0; i < actionCheckboxes.length; i++) {
- actionCheckboxes[i].checked = checked;
- Actions.toggleRow(actionCheckboxes[i].parentNode.parentNode, checked);
- }
- },
- counter: function() {
- counter = 0;
- for(var i = 0; i < actionCheckboxes.length; i++) {
- if(actionCheckboxes[i].checked){
- counter++;
- }
- }
- for(var i = 0; i < counterSpans.length; i++) {
- counterSpans[i].innerHTML = counter;
- }
- selectAll.checked = (counter == actionCheckboxes.length);
- }
-};
-
-addEvent(window, 'load', Actions.init);
+(function($) {
+ $.fn.actions = function(opts) {
+ var options = $.extend({}, $.fn.actions.defaults, opts);
+ var actionCheckboxes = $(this);
+ checker = function(checked) {
+ if (checked) {
+ showQuestion();
+ } else {
+ reset();
+ }
+ $(actionCheckboxes).attr("checked", checked)
+ .parent().parent().toggleClass(options.selectedClass, checked);
+ }
+ updateCounter = function() {
+ var count = $(actionCheckboxes).filter(":checked").length;
+ $("span._acnt").html(count);
+ $(options.allToggle).attr("checked", function() {
+ if (count == actionCheckboxes.length) {
+ value = true;
+ showQuestion();
+ } else {
+ value = false;
+ clearAcross();
+ }
+ return value
+ });
+ }
+ showQuestion = function() {
+ $(options.acrossClears).hide();
+ $(options.acrossQuestions).show();
+ $(options.allContainer).hide();
+ }
+ showClear = function() {
+ $(options.acrossClears).show();
+ $(options.acrossQuestions).hide();
+ $(options.actionContainer).toggleClass(options.selectedClass);
+ $(options.allContainer).show();
+ $(options.counterContainer).hide();
+ }
+ reset = function() {
+ $(options.acrossClears).hide();
+ $(options.acrossQuestions).hide();
+ $(options.allContainer).hide();
+ $(options.counterContainer).show();
+ }
+ clearAcross = function() {
+ reset();
+ $(options.acrossInput).val(0);
+ $(options.actionContainer).removeClass(options.selectedClass);
+ }
+ // Show counter by default
+ $(options.counterContainer).show();
+ // Check state of checkboxes and reinit state if needed
+ $(this).filter(":checked").each(function(i) {
+ $(this).parent().parent().toggleClass(options.selectedClass);
+ updateCounter();
+ if ($(options.acrossInput).val() == 1) {
+ showClear();
+ }
+ });
+ $(options.allToggle).show().click(function() {
+ checker($(this).attr("checked"));
+ updateCounter();
+ });
+ $("div.actions span.question a").click(function(event) {
+ event.preventDefault();
+ $(options.acrossInput).val(1);
+ showClear();
+ });
+ $("div.actions span.clear a").click(function(event) {
+ event.preventDefault();
+ $(options.allToggle).attr("checked", false);
+ clearAcross();
+ checker(0);
+ updateCounter();
+ });
+ lastChecked = null;
+ $(actionCheckboxes).click(function(event) {
+ if (!event) { var event = window.event; }
+ var target = event.target ? event.target : event.srcElement;
+ if (lastChecked && $.data(lastChecked) != $.data(target) && event.shiftKey == true) {
+ var inrange = false;
+ $(lastChecked).attr("checked", target.checked)
+ .parent().parent().toggleClass(options.selectedClass, target.checked);
+ $(actionCheckboxes).each(function() {
+ if ($.data(this) == $.data(lastChecked) || $.data(this) == $.data(target)) {
+ inrange = (inrange) ? false : true;
+ }
+ if (inrange) {
+ $(this).attr("checked", target.checked)
+ .parent().parent().toggleClass(options.selectedClass, target.checked);
+ }
+ });
+ }
+ $(target).parent().parent().toggleClass(options.selectedClass, target.checked);
+ lastChecked = target;
+ updateCounter();
+ });
+ }
+ /* Setup plugin defaults */
+ $.fn.actions.defaults = {
+ actionContainer: "div.actions",
+ counterContainer: "span.action-counter",
+ allContainer: "div.actions span.all",
+ acrossInput: "div.actions input.select-across",
+ acrossQuestions: "div.actions span.question",
+ acrossClears: "div.actions span.clear",
+ allToggle: "#action-toggle",
+ selectedClass: "selected"
+ }
+})(jQuery);
View
1  django/contrib/admin/media/js/actions.min.js
@@ -0,0 +1 @@
+(function(a){a.fn.actions=function(d){var c=a.extend({},a.fn.actions.defaults,d);var b=a(this);checker=function(e){if(e){showQuestion()}else{reset()}a(b).attr("checked",e).parent().parent().toggleClass(c.selectedClass,e)};updateCounter=function(){var e=a(b).filter(":checked").length;a("span._acnt").html(e);a(c.allToggle).attr("checked",function(){if(e==b.length){value=true;showQuestion()}else{value=false;clearAcross()}return value})};showQuestion=function(){a(c.acrossClears).hide();a(c.acrossQuestions).show();a(c.allContainer).hide()};showClear=function(){a(c.acrossClears).show();a(c.acrossQuestions).hide();a(c.actionContainer).toggleClass(c.selectedClass);a(c.allContainer).show();a(c.counterContainer).hide()};reset=function(){a(c.acrossClears).hide();a(c.acrossQuestions).hide();a(c.allContainer).hide();a(c.counterContainer).show()};clearAcross=function(){reset();a(c.acrossInput).val(0);a(c.actionContainer).removeClass(c.selectedClass)};a(c.counterContainer).show();a(this).filter(":checked").each(function(e){a(this).parent().parent().toggleClass(c.selectedClass);updateCounter();if(a(c.acrossInput).val()==1){showClear()}});a(c.allToggle).show().click(function(){checker(a(this).attr("checked"));updateCounter()});a("div.actions span.question a").click(function(e){e.preventDefault();a(c.acrossInput).val(1);showClear()});a("div.actions span.clear a").click(function(e){e.preventDefault();a(c.allToggle).attr("checked",false);clearAcross();checker(0);updateCounter()});lastChecked=null;a(b).click(function(f){if(!f){var f=window.event}var g=f.target?f.target:f.srcElement;if(lastChecked&&a.data(lastChecked)!=a.data(g)&&f.shiftKey==true){var e=false;a(lastChecked).attr("checked",g.checked).parent().parent().toggleClass(c.selectedClass,g.checked);a(b).each(function(){if(a.data(this)==a.data(lastChecked)||a.data(this)==a.data(g)){e=(e)?false:true}if(e){a(this).attr("checked",g.checked).parent().parent().toggleClass(c.selectedClass,g.checked)}})}a(g).parent().parent().toggleClass(c.selectedClass,g.checked);lastChecked=g;updateCounter()})};a.fn.actions.defaults={actionContainer:"div.actions",counterContainer:"span.action-counter",allContainer:"div.actions span.all",acrossInput:"div.actions input.select-across",acrossQuestions:"div.actions span.question",acrossClears:"div.actions span.clear",allToggle:"#action-toggle",selectedClass:"selected"}})(jQuery);
View
14 django/contrib/admin/options.py
@@ -268,7 +268,7 @@ def _media(self):
js = ['js/core.js', 'js/admin/RelatedObjectLookups.js']
if self.actions is not None:
- js.extend(['js/getElementsBySelector.js', 'js/actions.js'])
+ js.extend(['js/jquery.min.js', 'js/actions.min.js'])
if self.prepopulated_fields:
js.append('js/urlify.js')
if self.opts.get_ordered_objects():
@@ -724,18 +724,24 @@ def response_action(self, request, queryset):
# 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
View
18 django/contrib/admin/templates/admin/actions.html
@@ -1,10 +1,20 @@
{% 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>
+
View
10 django/contrib/admin/templates/admin/change_list.html
@@ -17,6 +17,16 @@
{% endif %}
{% endblock %}
+{% block extrahead %}
+{{ media }}
+<script type="text/javascript">
+jQuery.noConflict();
+jQuery(document).ready(function($) {
+ $("tr input.action-select").actions();
+});
+</script>
+{% endblock %}
+
{% block bodyclass %}change-list{% endblock %}
{% if not is_popup %}
Please sign in to comment.
Something went wrong with that request. Please try again.