Commit aba95dcc authored by Jannis Leidel's avatar Jannis Leidel
Browse files

Fixed #13023 - Removed ambiguity with regard to the max_num option of formsets... 

Fixed #13023 - Removed ambiguity with regard to the max_num option of formsets and as a result of admin inlines. Thanks to Gabriel Hurley for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12872 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 9df8d9c2

AUTHORS

+1 −0
Original line number Diff line number Diff line
@@ -225,6 +225,7 @@ answer newbie questions, and generally made Django that much better: 
    John Huddleston <huddlej@wwu.edu>

    Rob Hudson <http://rob.cogit8.org/>

    Jason Huggins <http://www.jrandolph.com/blog/>

    Gabriel Hurley <gabriel@strikeawe.com>

    Hyun Mi Ae

    Ibon <ibonso@gmail.com>

    Tom Insam

django/contrib/admin/media/js/inlines.js

+5 −4
Original line number Diff line number Diff line
@@ -32,8 +32,9 @@ 
		};

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

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

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

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

		// 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;

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

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

		});
@@ -77,7 +78,7 @@ 
				// Update number of total forms

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

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

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

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

					addButton.parent().hide();

				}

				// The delete button of each row triggers a bunch of other things
@@ -93,7 +94,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() == 0) || (maxForms.val() >= forms.length)) {

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

						addButton.parent().show();

					}

					// Also, update names and ids for all remaining form controls

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

+3 −3
Original line number Diff line number Diff line 
(function(a){a.fn.formset=function(f){var b=a.extend({},a.fn.formset.defaults,f),l=function(d,e,j){var c=new RegExp("("+e+"-\\d+)");e=e+"-"+j;a(d).attr("for")&&a(d).attr("for",a(d).attr("for").replace(c,e));if(d.id)d.id=d.id.replace(c,e);if(d.name)d.name=d.name.replace(c,e)};f=a("#id_"+b.prefix+"-TOTAL_FORMS").attr("autocomplete","off");var h=a("#id_"+b.prefix+"-MAX_NUM_FORMS").attr("autocomplete","off");f=h.val()==0||h.val()-f.val()>0;a(this).each(function(){a(this).not("."+b.emptyCssClass).addClass(b.formCssClass)});

(function(a){a.fn.formset=function(f){var b=a.extend({},a.fn.formset.defaults,f),l=function(d,e,j){var c=new RegExp("("+e+"-\\d+)");e=e+"-"+j;a(d).attr("for")&&a(d).attr("for",a(d).attr("for").replace(c,e));if(d.id)d.id=d.id.replace(c,e);if(d.name)d.name=d.name.replace(c,e)};f=a("#id_"+b.prefix+"-TOTAL_FORMS").attr("autocomplete","off");var h=a("#id_"+b.prefix+"-MAX_NUM_FORMS").attr("autocomplete","off");f=h.val()==""||h.val()-f.val()>0;a(this).each(function(){a(this).not("."+b.emptyCssClass).addClass(b.formCssClass)});

if(a(this).length&&f){var i;if(a(this).attr("tagName")=="TR"){f=this.eq(0).children().length;a(this).parent().append('<tr class="'+b.addCssClass+'"><td colspan="'+f+'"><a href="javascript:void(0)">'+b.addText+"</a></tr>");i=a(this).parent().find("tr:last a")}else{a(this).filter(":last").after('<div class="'+b.addCssClass+'"><a href="javascript:void(0)">'+b.addText+"</a></div>");i=a(this).filter(":last").next().find("a")}i.click(function(){var d=a("#id_"+b.prefix+"-TOTAL_FORMS"),e=parseInt(d.val()),

j=a("#"+b.prefix+"-empty"),c=j.clone(true).get(0);a(c).removeClass(b.emptyCssClass).removeAttr("id").insertBefore(a(j));a(c).html(a(c).html().replace(/__prefix__/g,e));a(c).addClass(b.formCssClass).attr("id",b.prefix+(parseInt(e)+1));if(a(c).is("TR"))a(c).children(":last").append('<div><a class="'+b.deleteCssClass+'" href="javascript:void(0)">'+b.deleteText+"</a></div>");else a(c).is("UL")||a(c).is("OL")?a(c).append('<li><a class="'+b.deleteCssClass+'" href="javascript:void(0)">'+b.deleteText+"</a></li>"):

a(c).children(":first").append('<span><a class="'+b.deleteCssClass+'" href="javascript:void(0)">'+b.deleteText+"</a></span>");a(c).find("input,select,textarea,label,a").each(function(){l(this,b.prefix,d.val())});a(d).val(e+1);h.val()!=0&&h.val()<=d.val()&&i.parent().hide();a(c).find("a."+b.deleteCssClass).click(function(){var g=a(this).parents("."+b.formCssClass);g.remove();b.removed&&b.removed(g);g=a("."+b.formCssClass);a("#id_"+b.prefix+"-TOTAL_FORMS").val(g.length);if(h.val()==0||h.val()>=g.length)i.parent().show();

j=a("#"+b.prefix+"-empty"),c=j.clone(true).get(0);a(c).removeClass(b.emptyCssClass).removeAttr("id").insertBefore(a(j));a(c).html(a(c).html().replace(/__prefix__/g,e));a(c).addClass(b.formCssClass).attr("id",b.prefix+(e+1));if(a(c).is("TR"))a(c).children(":last").append('<div><a class="'+b.deleteCssClass+'" href="javascript:void(0)">'+b.deleteText+"</a></div>");else a(c).is("UL")||a(c).is("OL")?a(c).append('<li><a class="'+b.deleteCssClass+'" href="javascript:void(0)">'+b.deleteText+"</a></li>"):

a(c).children(":first").append('<span><a class="'+b.deleteCssClass+'" href="javascript:void(0)">'+b.deleteText+"</a></span>");a(c).find("input,select,textarea,label,a").each(function(){l(this,b.prefix,d.val())});a(d).val(e+1);h.val()!=""&&h.val()<=d.val()&&i.parent().hide();a(c).find("a."+b.deleteCssClass).click(function(){var g=a(this).parents("."+b.formCssClass);g.remove();b.removed&&b.removed(g);g=a("."+b.formCssClass);a("#id_"+b.prefix+"-TOTAL_FORMS").val(g.length);if(h.val()==""||h.val()>=g.length)i.parent().show();

for(var k=0,m=g.length;k<m;k++)a(g.get(k)).find("input,select,textarea,label,a").each(function(){l(this,b.prefix,k)});return false});b.added&&b.added(a(c));return false})}return this};a.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}})(jQuery);

django/contrib/admin/options.py

+1 −1
Original line number Diff line number Diff line
@@ -1179,7 +1179,7 @@ class InlineModelAdmin(BaseModelAdmin): 
    fk_name = None

    formset = BaseInlineFormSet

    extra = 3

    max_num = 0

    max_num = None

    template = None

    verbose_name = None

    verbose_name_plural = None

django/contrib/admin/validation.py

+9 −5
Original line number Diff line number Diff line
@@ -170,11 +170,15 @@ def validate_inline(cls, parent, parent_model): 
    fk = _get_foreign_key(parent_model, cls.model, fk_name=cls.fk_name, can_fail=True)



    # extra = 3

    # max_num = 0

    for attr in ('extra', 'max_num'):

        if not isinstance(getattr(cls, attr), int):

            raise ImproperlyConfigured("'%s.%s' should be a integer."

                    % (cls.__name__, attr))

    if not isinstance(getattr(cls, 'extra'), int):

        raise ImproperlyConfigured("'%s.extra' should be a integer."

                % cls.__name__)



    # max_num = None

    max_num = getattr(cls, 'max_num', None)

    if max_num is not None and not isinstance(max_num, int):

        raise ImproperlyConfigured("'%s.max_num' should be an integer or None (default)."

                % cls.__name__)



    # formset

    if hasattr(cls, 'formset') and not issubclass(cls.formset, BaseModelFormSet):