Fixed bug causing generated checkbox elements to always return False …

…in Django.Bug report and patch submitted by Wilson.Andrew.J. git-svn-id: https://django-dynamic-formset.googlecode.com/svn/trunk@5 9f2ace40-7153-11de-83e1-4fc93b4a6815
elo80ka · Oct 28, 2009 · 1f495fc · 1f495fc
1 parent 6747931
commit 1f495fc
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 4 deletions.
diff --git a/demo/example/forms.py b/demo/example/forms.py
@@ -44,5 +44,6 @@ def get_ordereditem_formset(form, formset=models.BaseInlineFormSet, **kwargs):
 class ContactInfoForm(forms.Form):
     type = fields.ChoiceField(choices=CONTACT_INFO_TYPES)
     value = fields.CharField(max_length=200)
+    preferred = fields.BooleanField(required=False)
 
 ContactFormset = formsets.formset_factory(ContactInfoForm)
diff --git a/demo/static/js/jquery.formset.min.js b/demo/static/js/jquery.formset.min.js
diff --git a/demo/templates/example/formset-stacked.html b/demo/templates/example/formset-stacked.html
@@ -32,6 +32,7 @@
                 {{ form.type }}
                 {{ form.value.label_tag }}<br />
                 {{ form.value }}
+                {{ form.preferred }} {{ form.preferred.label_tag }}
             </div>
             {% endfor %}
             {{ formset.management_form }}

diff --git a/demo/templates/example/formset-table.html b/demo/templates/example/formset-table.html
@@ -33,13 +33,15 @@
             <table id="id_contact_info_table" border="0" cellpadding="0" cellspacing="5">
                 <thead>
                     <tr>
+                        <th scope="col">Preferred</th>
                         <th scope="col">Type</th>
                         <th scope="col">Value</th>
                     </tr>
                 </thead>
                 <tbody>
                     {% for form in formset.forms %}
                     <tr id="{{ form.prefix }}-row">
+                        <td style="text-align:center;">{{ form.preferred }}</td>
                         <td>{{ form.type }}</td>
                         <td>{{ form.value }}</td>
                     </tr>

diff --git a/demo/templates/example/posted-data.html b/demo/templates/example/posted-data.html
@@ -15,7 +15,8 @@ <h1 class="title">Posted data</h1>
             <strong>Quantity:</strong> {{ form_data.quantity }}
             {% else %}
             <strong>Type:</strong> {{ form_data.type }}<br />
-            <strong>Value:</strong> {{ form_data.value }}
+            <strong>Value:</strong> {{ form_data.value }}<br />
+            <strong>Preferred:</strong> {{ form_data.preferred }}
             {% endif %}
         </p>
         {% endfor %}

diff --git a/src/jquery.formset.js b/src/jquery.formset.js
@@ -71,7 +71,14 @@
                 $(row).removeAttr('id').insertAfter($('.dynamic-form:last'));
                 $(row).find('input,select,textarea,label').each(function() {
                     updateElementIndex(this, options.prefix, nextIndex);
-                    $(this).val('');
+                    // If this is a checkbox or radiobutton, set uncheck it.
+                    // Fix for Issue 1, reported by Wilson.Andrew.J:
+                    var $$ = $(this);
+                    if ($$.is('input:checkbox') || $$.is('input:radio')) {
+                        $$.attr('checked', false);
+                    } else {
+                        $$.val('');
+                    }
                 });
                 var formCount = nextIndex + 1;
                 $('#id_' + options.prefix + '-TOTAL_FORMS').val(formCount);