Commit eee791e9 authored by martin.bohacek's avatar martin.bohacek
Browse files

Merge branch 'master' of https://github.com/django/django

parents fbb73894 840ffd80

AUTHORS

+3 −2
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ answer newbie questions, and generally made Django that much better: 
    Simon Blanchard

    David Blewett <david@dawninglight.net>

    Matt Boersma <matt@sprout.org>

    boobsd@gmail.com

    Artem Gnilov <boobsd@gmail.com>

    Matías Bordese

    Nate Bragg <jonathan.bragg@alum.rpi.edu>

    Sean Brant
@@ -211,7 +211,6 @@ answer newbie questions, and generally made Django that much better: 
    Dimitris Glezos <dimitris@glezos.com>

    glin@seznam.cz

    martin.glueck@gmail.com

    Artyom Gnilov <boobsd@gmail.com>

    Ben Godfrey <http://aftnn.org>

    GomoX <gomo@datafull.com>

    Guilherme Mesquita Gondim <semente@taurinus.org>
@@ -347,6 +346,7 @@ answer newbie questions, and generally made Django that much better: 
    Frantisek Malina <vizualbod@vizualbod.com>

    Mike Malone <mjmalone@gmail.com>

    Martin Maney <http://www.chipy.org/Martin_Maney>

    Michael Manfre <mmanfre@gmail.com>

    masonsimon+django@gmail.com

    Manuzhai

    Petr Marhoun <petr.marhoun@gmail.com>
@@ -401,6 +401,7 @@ answer newbie questions, and generally made Django that much better: 
    Christian Oudard <christian.oudard@gmail.com>

    oggie rob <oz.robharvey@gmail.com>

    oggy <ognjen.maric@gmail.com>

    Jens Page

    Jay Parlar <parlar@gmail.com>

    Carlos Eduardo de Paula <carlosedp@gmail.com>

    John Paulett <john@paulett.org>

django/contrib/admin/static/admin/js/actions.js

+11 −11
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
		var options = $.extend({}, $.fn.actions.defaults, opts);

		var actionCheckboxes = $(this);

		var list_editable_changed = false;

		checker = function(checked) {

		var checker = function(checked) {

			if (checked) {

				showQuestion();

			} else {
@@ -11,7 +11,7 @@ 
			}

			$(actionCheckboxes).attr("checked", checked)

				.parent().parent().toggleClass(options.selectedClass, checked);

		}

		},

		updateCounter = function() {

			var sel = $(actionCheckboxes).filter(":checked").length;

			$(options.counterContainer).html(interpolate(
@@ -29,30 +29,30 @@ 
				}

				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
@@ -81,9 +81,9 @@ 
		});

		lastChecked = null;

		$(actionCheckboxes).click(function(event) {

			if (!event) { var event = window.event; }

			if (!event) { event = window.event; }

			var target = event.target ? event.target : event.srcElement;

			if (lastChecked && $.data(lastChecked) != $.data(target) && event.shiftKey == true) {

			if (lastChecked && $.data(lastChecked) != $.data(target) && event.shiftKey === true) {

				var inrange = false;

				$(lastChecked).attr("checked", target.checked)

					.parent().parent().toggleClass(options.selectedClass, target.checked);
@@ -124,7 +124,7 @@ 
				}

			}

		});

	}

	};

	/* Setup plugin defaults */

	$.fn.actions.defaults = {

		actionContainer: "div.actions",
@@ -135,5 +135,5 @@ 
		acrossClears: "div.actions span.clear",

		allToggle: "#action-toggle",

		selectedClass: "selected"

	}

	};

})(django.jQuery);

django/contrib/admin/static/admin/js/actions.min.js

+6 −7
Original line number Diff line number Diff line 
(function(a){a.fn.actions=function(g){var b=a.extend({},a.fn.actions.defaults,g),f=a(this),e=!1;checker=function(c){c?showQuestion():reset();a(f).attr("checked",c).parent().parent().toggleClass(b.selectedClass,c)};updateCounter=function(){var c=a(f).filter(":checked").length;a(b.counterContainer).html(interpolate(ngettext("%(sel)s of %(cnt)s selected","%(sel)s of %(cnt)s selected",c),{sel:c,cnt:_actions_icnt},!0));a(b.allToggle).attr("checked",function(){c==f.length?(value=!0,showQuestion()):(value=

!1,clearAcross());return value})};showQuestion=function(){a(b.acrossClears).hide();a(b.acrossQuestions).show();a(b.allContainer).hide()};showClear=function(){a(b.acrossClears).show();a(b.acrossQuestions).hide();a(b.actionContainer).toggleClass(b.selectedClass);a(b.allContainer).show();a(b.counterContainer).hide()};reset=function(){a(b.acrossClears).hide();a(b.acrossQuestions).hide();a(b.allContainer).hide();a(b.counterContainer).show()};clearAcross=function(){reset();a(b.acrossInput).val(0);a(b.actionContainer).removeClass(b.selectedClass)};

a(b.counterContainer).show();a(this).filter(":checked").each(function(){a(this).parent().parent().toggleClass(b.selectedClass);updateCounter();1==a(b.acrossInput).val()&&showClear()});a(b.allToggle).show().click(function(){checker(a(this).attr("checked"));updateCounter()});a("div.actions span.question a").click(function(c){c.preventDefault();a(b.acrossInput).val(1);showClear()});a("div.actions span.clear a").click(function(c){c.preventDefault();a(b.allToggle).attr("checked",!1);clearAcross();checker(0);

updateCounter()});lastChecked=null;a(f).click(function(c){if(!c)c=window.event;var d=c.target?c.target:c.srcElement;if(lastChecked&&a.data(lastChecked)!=a.data(d)&&!0==c.shiftKey){var e=!1;a(lastChecked).attr("checked",d.checked).parent().parent().toggleClass(b.selectedClass,d.checked);a(f).each(function(){if(a.data(this)==a.data(lastChecked)||a.data(this)==a.data(d))e=e?!1:!0;e&&a(this).attr("checked",d.checked).parent().parent().toggleClass(b.selectedClass,d.checked)})}a(d).parent().parent().toggleClass(b.selectedClass,

d.checked);lastChecked=d;updateCounter()});a("form#changelist-form table#result_list tr").find("td:gt(0) :input").change(function(){e=!0});a('form#changelist-form button[name="index"]').click(function(){if(e)return confirm(gettext("You have unsaved changes on individual editable fields. If you run an action, your unsaved changes will be lost."))});a('form#changelist-form input[name="_save"]').click(function(){var b=!1;a("div.actions select option:selected").each(function(){a(this).val()&&(b=!0)});

if(b)return e?confirm(gettext("You have selected an action, but you haven't saved your changes to individual fields yet. Please click OK to save. You'll need to re-run the action.")):confirm(gettext("You have selected an action, and you haven't made any changes on individual fields. You're probably looking for the Go button rather than the Save button."))})};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"}})(django.jQuery);
 
(function(a){a.fn.actions=function(m){var b=a.extend({},a.fn.actions.defaults,m),f=a(this),e=!1,j=function(c){c?h():i();a(f).attr("checked",c).parent().parent().toggleClass(b.selectedClass,c)},g=function(){var c=a(f).filter(":checked").length;a(b.counterContainer).html(interpolate(ngettext("%(sel)s of %(cnt)s selected","%(sel)s of %(cnt)s selected",c),{sel:c,cnt:_actions_icnt},!0));a(b.allToggle).attr("checked",function(){c==f.length?(value=!0,h()):(value=!1,k());return value})},h=function(){a(b.acrossClears).hide();

a(b.acrossQuestions).show();a(b.allContainer).hide()},l=function(){a(b.acrossClears).show();a(b.acrossQuestions).hide();a(b.actionContainer).toggleClass(b.selectedClass);a(b.allContainer).show();a(b.counterContainer).hide()},i=function(){a(b.acrossClears).hide();a(b.acrossQuestions).hide();a(b.allContainer).hide();a(b.counterContainer).show()},k=function(){i();a(b.acrossInput).val(0);a(b.actionContainer).removeClass(b.selectedClass)};a(b.counterContainer).show();a(this).filter(":checked").each(function(){a(this).parent().parent().toggleClass(b.selectedClass);

g();1==a(b.acrossInput).val()&&l()});a(b.allToggle).show().click(function(){j(a(this).attr("checked"));g()});a("div.actions span.question a").click(function(c){c.preventDefault();a(b.acrossInput).val(1);l()});a("div.actions span.clear a").click(function(c){c.preventDefault();a(b.allToggle).attr("checked",!1);k();j(0);g()});lastChecked=null;a(f).click(function(c){c||(c=window.event);var d=c.target?c.target:c.srcElement;if(lastChecked&&a.data(lastChecked)!=a.data(d)&&!0===c.shiftKey){var e=!1;a(lastChecked).attr("checked",

d.checked).parent().parent().toggleClass(b.selectedClass,d.checked);a(f).each(function(){if(a.data(this)==a.data(lastChecked)||a.data(this)==a.data(d))e=e?false:true;e&&a(this).attr("checked",d.checked).parent().parent().toggleClass(b.selectedClass,d.checked)})}a(d).parent().parent().toggleClass(b.selectedClass,d.checked);lastChecked=d;g()});a("form#changelist-form table#result_list tr").find("td:gt(0) :input").change(function(){e=!0});a('form#changelist-form button[name="index"]').click(function(){if(e)return confirm(gettext("You have unsaved changes on individual editable fields. If you run an action, your unsaved changes will be lost."))});

a('form#changelist-form input[name="_save"]').click(function(){var b=!1;a("div.actions select option:selected").each(function(){a(this).val()&&(b=!0)});if(b)return e?confirm(gettext("You have selected an action, but you haven't saved your changes to individual fields yet. Please click OK to save. You'll need to re-run the action.")):confirm(gettext("You have selected an action, and you haven't made any changes on individual fields. You're probably looking for the Go button rather than the Save button."))})};

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"}})(django.jQuery);

django/contrib/admin/static/admin/js/inlines.js

+13 −13
Original line number Diff line number Diff line
@@ -31,11 +31,11 @@ 
			}

		};

		var totalForms = $("#id_" + options.prefix + "-TOTAL_FORMS").attr("autocomplete", "off");

		var nextIndex = parseInt(totalForms.val());

		var nextIndex = parseInt(totalForms.val(), 10);

		var maxForms = $("#id_" + options.prefix + "-MAX_NUM_FORMS").attr("autocomplete", "off");

		// only show the add button if we are allowed to add more items,

        // note that max_num = None translates to a blank string.

		var showAddButton = maxForms.val() == '' || (maxForms.val()-totalForms.val()) > 0;

		var showAddButton = maxForms.val() === '' || (maxForms.val()-totalForms.val()) > 0;

		$(this).each(function(i) {

			$(this).not("." + options.emptyCssClass).addClass(options.formCssClass);

		});
@@ -52,7 +52,8 @@ 
				$(this).filter(":last").after('<div class="' + options.addCssClass + '"><a href="javascript:void(0)">' + options.addText + "</a></div>");

				addButton = $(this).filter(":last").next().find("a");

			}

			addButton.click(function() {

			addButton.click(function(e) {

				e.preventDefault();

				var totalForms = $("#id_" + options.prefix + "-TOTAL_FORMS");

				var template = $("#" + options.prefix + "-empty");

				var row = template.clone(true);
@@ -78,14 +79,15 @@ 
				// Insert the new form when it has been fully edited

				row.insertBefore($(template));

				// Update number of total forms

				$(totalForms).val(parseInt(totalForms.val()) + 1);

				$(totalForms).val(parseInt(totalForms.val(), 10) + 1);

				nextIndex += 1;

				// Hide add button in case we've hit the max, except we want to add infinitely

				if ((maxForms.val() != '') && (maxForms.val()-totalForms.val()) <= 0) {

				if ((maxForms.val() !== '') && (maxForms.val()-totalForms.val()) <= 0) {

					addButton.parent().hide();

				}

				// The delete button of each row triggers a bunch of other things

				row.find("a." + options.deleteCssClass).click(function() {

				row.find("a." + options.deleteCssClass).click(function(e) {

					e.preventDefault();

					// Remove the parent form containing this button:

					var row = $(this).parents("." + options.formCssClass);

					row.remove();
@@ -98,7 +100,7 @@ 
					var forms = $("." + options.formCssClass);

					$("#id_" + options.prefix + "-TOTAL_FORMS").val(forms.length);

					// Show add button again once we drop below max

					if ((maxForms.val() == '') || (maxForms.val()-forms.length) > 0) {

					if ((maxForms.val() === '') || (maxForms.val()-forms.length) > 0) {

						addButton.parent().show();

					}

					// Also, update names and ids for all remaining form controls
@@ -110,17 +112,15 @@ 
							updateElementIndex(this, options.prefix, i);

						});

					}

					return false;

				});

				// If a post-add callback was supplied, call it with the added form:

				if (options.added) {

					options.added(row);

				}

				return false;

			});

		}

		return this;

	}

	};

	/* Setup plugin defaults */

	$.fn.formset.defaults = {

		prefix: "form",					// The form prefix for your django formset
@@ -132,5 +132,5 @@ 
		formCssClass: "dynamic-form",	// CSS class applied to each form in a formset

		added: null,					// Function called each time a new form is added

		removed: null					// Function called each time a form is deleted

	}

	};

})(django.jQuery);

django/contrib/admin/static/admin/js/inlines.min.js

+5 −5
Original line number Diff line number Diff line 
(function(b){b.fn.formset=function(c){var a=b.extend({},b.fn.formset.defaults,c),j=function(a,e,d){var i=RegExp("("+e+"-(\\d+|__prefix__))"),e=e+"-"+d;b(a).attr("for")&&b(a).attr("for",b(a).attr("for").replace(i,e));if(a.id)a.id=a.id.replace(i,e);if(a.name)a.name=a.name.replace(i,e)},c=b("#id_"+a.prefix+"-TOTAL_FORMS").attr("autocomplete","off"),g=parseInt(c.val()),f=b("#id_"+a.prefix+"-MAX_NUM_FORMS").attr("autocomplete","off"),c=""==f.val()||0<f.val()-c.val();b(this).each(function(){b(this).not("."+

a.emptyCssClass).addClass(a.formCssClass)});if(b(this).length&&c){var h;"TR"==b(this).attr("tagName")?(c=this.eq(0).children().length,b(this).parent().append('<tr class="'+a.addCssClass+'"><td colspan="'+c+'"><a href="javascript:void(0)">'+a.addText+"</a></tr>"),h=b(this).parent().find("tr:last a")):(b(this).filter(":last").after('<div class="'+a.addCssClass+'"><a href="javascript:void(0)">'+a.addText+"</a></div>"),h=b(this).filter(":last").next().find("a"));h.click(function(){var c=b("#id_"+a.prefix+

"-TOTAL_FORMS"),e=b("#"+a.prefix+"-empty"),d=e.clone(!0);d.removeClass(a.emptyCssClass).addClass(a.formCssClass).attr("id",a.prefix+"-"+g);d.is("tr")?d.children(":last").append('<div><a class="'+a.deleteCssClass+'" href="javascript:void(0)">'+a.deleteText+"</a></div>"):d.is("ul")||d.is("ol")?d.append('<li><a class="'+a.deleteCssClass+'" href="javascript:void(0)">'+a.deleteText+"</a></li>"):d.children(":first").append('<span><a class="'+a.deleteCssClass+'" href="javascript:void(0)">'+a.deleteText+

"</a></span>");d.find("*").each(function(){j(this,a.prefix,c.val())});d.insertBefore(b(e));b(c).val(parseInt(c.val())+1);g+=1;""!=f.val()&&0>=f.val()-c.val()&&h.parent().hide();d.find("a."+a.deleteCssClass).click(function(){var c=b(this).parents("."+a.formCssClass);c.remove();g-=1;a.removed&&a.removed(c);c=b("."+a.formCssClass);b("#id_"+a.prefix+"-TOTAL_FORMS").val(c.length);(""==f.val()||0<f.val()-c.length)&&h.parent().show();for(var d=0,e=c.length;d<e;d++)j(b(c).get(d),a.prefix,d),b(c.get(d)).find("*").each(function(){j(this,

a.prefix,d)});return!1});a.added&&a.added(d);return!1})}return this};b.fn.formset.defaults={prefix:"form",addText:"add another",deleteText:"remove",addCssClass:"add-row",deleteCssClass:"delete-row",emptyCssClass:"empty-row",formCssClass:"dynamic-form",added:null,removed:null}})(django.jQuery);
 
(function(b){b.fn.formset=function(c){var a=b.extend({},b.fn.formset.defaults,c),j=function(a,f,d){var e=RegExp("("+f+"-(\\d+|__prefix__))"),f=f+"-"+d;b(a).attr("for")&&b(a).attr("for",b(a).attr("for").replace(e,f));a.id&&(a.id=a.id.replace(e,f));a.name&&(a.name=a.name.replace(e,f))},c=b("#id_"+a.prefix+"-TOTAL_FORMS").attr("autocomplete","off"),h=parseInt(c.val(),10),g=b("#id_"+a.prefix+"-MAX_NUM_FORMS").attr("autocomplete","off"),c=""===g.val()||0<g.val()-c.val();b(this).each(function(){b(this).not("."+

a.emptyCssClass).addClass(a.formCssClass)});if(b(this).length&&c){var i;"TR"==b(this).attr("tagName")?(c=this.eq(0).children().length,b(this).parent().append('<tr class="'+a.addCssClass+'"><td colspan="'+c+'"><a href="javascript:void(0)">'+a.addText+"</a></tr>"),i=b(this).parent().find("tr:last a")):(b(this).filter(":last").after('<div class="'+a.addCssClass+'"><a href="javascript:void(0)">'+a.addText+"</a></div>"),i=b(this).filter(":last").next().find("a"));i.click(function(c){c.preventDefault();

var f=b("#id_"+a.prefix+"-TOTAL_FORMS"),c=b("#"+a.prefix+"-empty"),d=c.clone(true);d.removeClass(a.emptyCssClass).addClass(a.formCssClass).attr("id",a.prefix+"-"+h);d.is("tr")?d.children(":last").append('<div><a class="'+a.deleteCssClass+'" href="javascript:void(0)">'+a.deleteText+"</a></div>"):d.is("ul")||d.is("ol")?d.append('<li><a class="'+a.deleteCssClass+'" href="javascript:void(0)">'+a.deleteText+"</a></li>"):d.children(":first").append('<span><a class="'+a.deleteCssClass+'" href="javascript:void(0)">'+

a.deleteText+"</a></span>");d.find("*").each(function(){j(this,a.prefix,f.val())});d.insertBefore(b(c));b(f).val(parseInt(f.val(),10)+1);h=h+1;g.val()!==""&&g.val()-f.val()<=0&&i.parent().hide();d.find("a."+a.deleteCssClass).click(function(e){e.preventDefault();e=b(this).parents("."+a.formCssClass);e.remove();h=h-1;a.removed&&a.removed(e);e=b("."+a.formCssClass);b("#id_"+a.prefix+"-TOTAL_FORMS").val(e.length);(g.val()===""||g.val()-e.length>0)&&i.parent().show();for(var c=0,d=e.length;c<d;c++){j(b(e).get(c),

a.prefix,c);b(e.get(c)).find("*").each(function(){j(this,a.prefix,c)})}});a.added&&a.added(d)})}return this};b.fn.formset.defaults={prefix:"form",addText:"add another",deleteText:"remove",addCssClass:"add-row",deleteCssClass:"delete-row",emptyCssClass:"empty-row",formCssClass:"dynamic-form",added:null,removed:null}})(django.jQuery);