Correct town display (closes #524)

1 files changed, 12 insertions, 14 deletions

diff --git a/ishtar/ishtar_base/forms_operations.py b/ishtar/ishtar_base/forms_operations.py
index 1df0b16bb..6e6cdc03e 100644
--- a/ishtar/ishtar_base/forms_operations.py
+++ b/ishtar/ishtar_base/forms_operations.py
@@ -36,9 +36,9 @@ import models
 import widgets
 from forms import Wizard, FinalForm, FormSet, SearchWizard, ClosingWizard, \
      DeletionWizard, formset_factory, get_now, reverse_lazy, get_form_selection
-from forms_common import TownForm, TownFormSet, ParcelFormSet, ParcelForm,\
-     AuthorFormset, SourceForm, SourceWizard, SourceSelect, SourceDeletionForm,\
-     get_town_field
+from forms_common import TownForm, TownFormSet, TownFormset, ParcelFormSet, \
+     ParcelForm, AuthorFormset, SourceForm, SourceWizard, SourceSelect, \
+     SourceDeletionForm, get_town_field
 
 def is_preventive(form_name, model, type_key='operation_type', key=''):
     def func(self, request, storage):
@@ -119,7 +119,7 @@ class OperationWizard(Wizard):
                                   [general_form_key][general_form_key+"-year"])
             data[prefix+'-hidden_year'] = year
         # manage the dynamic choice of towns
-        if step.startswith('towns') and hasattr(form, 'management_form'):
+        if step.startswith('towns-') and hasattr(form, 'management_form'):
             data['TOWNS'] = self.get_towns(request, storage)
         elif step.startswith('parcels') and hasattr(form, 'management_form'):
             file_id = self.session_get_value(request, storage, general_form_key,
@@ -319,13 +319,9 @@ class SelectedTownForm(forms.Form):
         if towns and towns != -1:
             self.fields['town'].choices = [('', '--')] + towns
 
-SelectedTownFormSet = formset_factory(SelectedTownForm, can_delete=True,
+SelectedTownFormset = formset_factory(SelectedTownForm, can_delete=True,
                                 formset=TownFormSet)
-SelectedTownFormSet.form_label = _("Towns")
-
-SelectedTownGeneralFormSet = formset_factory(TownForm, can_delete=True,
-                                             formset=TownFormSet)
-SelectedTownGeneralFormSet.form_label = _("Towns")
+SelectedTownFormset.form_label = _(u"Towns")
 
 class SelectedParcelForm(forms.Form):
     form_label = _("Parcels")
@@ -357,6 +353,7 @@ SelectedParcelGeneralFormSet.form_label = _("Parcels")
 
 class RemainForm(forms.Form):
     form_label = _("Remain types")
+    base_model = 'remain'
     associated_models = {'remain':models.RemainType}
     remain = forms.ChoiceField(label=_("Remain type"), required=False,
                                        choices=models.RemainType.get_types())
@@ -373,6 +370,7 @@ RemainFormset.form_label = _("Remain types")
 
 class PeriodForm(forms.Form):
     form_label = _("Periods")
+    base_model = 'period'
     associated_models = {'period':models.Period}
     period = forms.ChoiceField(label=_("Period"), required=False,
                                        choices=models.Period.get_types())
@@ -412,8 +410,8 @@ operation_creation_wizard = OperationWizard([
            ('refs-operation_creation', OperationFormReference),
            ('preventive-operation_creation', OperationFormPreventive),
            ('preventivediag-operation_creation', OperationFormPreventiveDiag),
-           ('townsgeneral-operation_creation', SelectedTownGeneralFormSet),
-           ('towns-operation_creation', SelectedTownFormSet),
+           ('townsgeneral-operation_creation', TownFormset),
+           ('towns-operation_creation', SelectedTownFormset),
            ('parcelsgeneral-operation_creation', SelectedParcelGeneralFormSet),
            ('parcels-operation_creation', SelectedParcelFormSet),
            ('remains-operation_creation', RemainFormset),
@@ -439,8 +437,8 @@ operation_modification_wizard = OperationWizard([
          ('refs-operation_modification', OperationFormReference),
          ('preventive-operation_modification', OperationFormPreventive),
          ('preventivediag-operation_modification', OperationFormPreventiveDiag),
-         ('towns-operation_modification', SelectedTownFormSet),
-         ('townsgeneral-operation_modification', SelectedTownGeneralFormSet),
+         ('towns-operation_modification', SelectedTownFormset),
+         ('townsgeneral-operation_modification', TownFormset),
          ('parcels-operation_modification', SelectedParcelFormSet),
          ('parcelsgeneral-operation_modification', SelectedParcelGeneralFormSet),
          ('remains-operation_modification', RemainFormset),