diff options
Diffstat (limited to 'ishtar/furnitures/forms.py')
| -rw-r--r-- | ishtar/furnitures/forms.py | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/ishtar/furnitures/forms.py b/ishtar/furnitures/forms.py index fa1844d60..78b9adfef 100644 --- a/ishtar/furnitures/forms.py +++ b/ishtar/furnitures/forms.py @@ -146,8 +146,12 @@ class Wizard(NamedUrlSessionFormWizard): if not lbl: continue value = cleaned_data[key] - if not value: + if not value and value != False: continue + if value == True: + value = _("Yes") + if value == False: + value = _("No") if key in associated_models: value = unicode(associated_models[key].objects.get( pk=value)) @@ -180,7 +184,7 @@ class Wizard(NamedUrlSessionFormWizard): # datas not managed continue value = frm.cleaned_data[key] - if not value: + if not value and value != False: continue value = associated_models[key].objects.get(pk=value) m2m.append((key, value)) @@ -382,7 +386,9 @@ class Wizard(NamedUrlSessionFormWizard): value = getattr(obj, field) if hasattr(value, 'pk'): value = value.pk - if value != None: + if value in (True, False): + initial[field] = value + elif value != None: initial[field] = unicode(value) elif hasattr(c_form, 'management_form'): initial = [] @@ -445,9 +451,9 @@ class PersonForm(forms.Form): widget=widgets.JQueryAutoComplete(reverse_lazy('autocomplete-organization'), associated_model=models.Organization), validators=[models.valid_id(models.Organization)], required=False) - is_author = forms.NullBooleanField(label=_(u"Is an author?"), + is_author = forms.BooleanField(label=_(u"Is an author?"), required=False) - in_charge_storage = forms.NullBooleanField(required=False, + in_charge_storage = forms.BooleanField(required=False, label=_(u"In charge of a storage?")) person_creation_wizard = PersonWizard([ |