Commit 7cbbd782 authored by Jacob Kaplan-Moss's avatar Jacob Kaplan-Moss
Browse files

[1.0.X] Fixed #9473: FormWizard now works with NullBooleanFields. As a bonus,... 

[1.0.X] Fixed #9473: FormWizard now works with NullBooleanFields. As a bonus, we now have the beginnings of a test suite for FormWizard. Thanks, Keith Bussell. Backport of r10316 and r10319 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10321 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 906f55bf

django/forms/widgets.py

+6 −1
Original line number Diff line number Diff line
@@ -400,7 +400,12 @@ class NullBooleanSelect(Select): 


    def value_from_datadict(self, data, files, name):

        value = data.get(name, None)

        return {u'2': True, u'3': False, True: True, False: False}.get(value, None)

        return {u'2': True, 

                True: True, 

                'True': True, 

                u'3': False, 

                'False': False, 

                False: False}.get(value, None)



    def _has_changed(self, initial, data):

        # Sometimes data or initial could be None or u'' which should be the

tests/regressiontests/formwizard/__init__.py

0 → 100644
+0 −0

Empty file added.

tests/regressiontests/formwizard/forms.py

0 → 100644
+18 −0
Original line number Diff line number Diff line 
from django import forms

from django.contrib.formtools.wizard import FormWizard

from django.http import HttpResponse



class Page1(forms.Form):

    name = forms.CharField(max_length=100)

    thirsty = forms.NullBooleanField()



class Page2(forms.Form):

    address1 = forms.CharField(max_length=100)

    address2 = forms.CharField(max_length=100)

    

class Page3(forms.Form):

    random_crap = forms.CharField(max_length=100)

    

class ContactWizard(FormWizard):

    def done(self, request, form_list):

        return HttpResponse("")

tests/regressiontests/formwizard/models.py

0 → 100644
+0 −0

Empty file added.

tests/regressiontests/formwizard/templates/forms/wizard.html

0 → 100644
+13 −0
Original line number Diff line number Diff line 
<html>

  <body>

    <p>Step {{ step }} of {{ step_count }}</p>

    <form action="." method="post">

    <table>

    {{ form }}

    </table>

    <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />

    {{ previous_fields|safe }}

    <input type="submit">

    </form>

  </body>

</html>
 
 No newline at end of file