diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2014-01-07 00:02:20 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2014-01-07 00:02:20 +0100 |
| commit | 6d02b3f9e5a2e2b525d834cbf310c352e950606c (patch) | |
| tree | f5a45107692f91ee3b72e8f2a2f170c41795e9ea | |
| parent | 38c8c815f74d0c4668be8eb0e2436769fcaa9ee4 (diff) | |
| download | Ishtar-6d02b3f9e5a2e2b525d834cbf310c352e950606c.tar.bz2 Ishtar-6d02b3f9e5a2e2b525d834cbf310c352e950606c.zip | |
Archaeological sites: fix wizard management (refs #1586)
| -rw-r--r-- | archaeological_operations/forms.py | 7 | ||||
| -rw-r--r-- | ishtar_common/wizards.py | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index 246fa88a6..76d7055d9 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -273,10 +273,11 @@ class OperationCodeInput(forms.TextInput): class OperationFormGeneral(forms.Form): form_label = _(u"General") + base_model = 'archaeological_site' associated_models = {'in_charge':Person, 'associated_file':File, 'operation_type':models.OperationType, - 'archaeological_sites':models.ArchaeologicalSite} + 'archaeological_site':models.ArchaeologicalSite} currents = {'associated_file':File} pk = forms.IntegerField(required=False, widget=forms.HiddenInput) in_charge = forms.IntegerField(label=_("Person in charge of the operation"), @@ -313,9 +314,9 @@ class OperationFormGeneral(forms.Form): max_length=120, widget=forms.Textarea) operator_reference = forms.CharField(label=_(u"Operator reference"), required=False, max_length=20) - archaeological_sites = widgets.MultipleAutocompleteField( + archaeological_site = widgets.MultipleAutocompleteField( model=models.ArchaeologicalSite, - label=_("Associated archaelogical sites"), + label=_("Associated archaeological sites"), new=True, required=False) if settings.COUNTRY == 'fr': negative_result = forms.NullBooleanField(required=False, diff --git a/ishtar_common/wizards.py b/ishtar_common/wizards.py index b775a0a36..d29a8458f 100644 --- a/ishtar_common/wizards.py +++ b/ishtar_common/wizards.py @@ -252,6 +252,7 @@ class Wizard(NamedUrlWizardView): def done(self, form_list, return_object=False, **kwargs): """Save to the model""" dct, m2m, whole_associated_models = {}, [], [] + # base_model for M2M for form in form_list: if not form.is_valid(): return self.render(form) |