diff options
| -rw-r--r-- | archaeological_finds/forms.py | 8 | ||||
| -rw-r--r-- | archaeological_finds/forms_treatments.py | 20 | ||||
| -rw-r--r-- | archaeological_finds/views.py | 4 |
3 files changed, 22 insertions, 10 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 854430c2c..9441e6899 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -47,10 +47,10 @@ from ishtar_common import widgets from archaeological_operations.widgets import OAWidget from archaeological_finds.forms_treatments import TreatmentSelect, \ - TreatmentFormSelection, BaseTreatmentForm, ModifyTreatmentForm, \ + TreatmentFormSelection, BaseTreatmentForm, TreatmentModifyForm, \ AdministrativeActTreatmentForm, TreatmentFormFileChoice, \ TreatmentDeletionForm, TreatmentFileSelect, TreatmentFileFormSelection, \ - TreatmentFileForm, ModifyTreatmentFileForm, TreatmentFileDeletionForm, \ + TreatmentFileForm, TreatmentFileModifyForm, TreatmentFileDeletionForm, \ AdministrativeActTreatmentFormSelection, \ AdministrativeActTreatmentModifForm, \ AdministrativeActTreatmentFileForm, \ @@ -61,11 +61,11 @@ from archaeological_finds.forms_treatments import TreatmentSelect, \ __all__ = [ 'TreatmentSelect', 'TreatmentFormSelection', 'BaseTreatmentForm', - 'ModifyTreatmentForm', 'AdministrativeActTreatmentForm', + 'TreatmentModifyForm', 'AdministrativeActTreatmentForm', 'TreatmentFormFileChoice', 'TreatmentDeletionForm', 'AdministrativeActTreatmentModifForm', 'TreatmentFileSelect', 'TreatmentFileFormSelection', 'TreatmentFileForm', - 'ModifyTreatmentFileForm', 'TreatmentFileDeletionForm', + 'TreatmentFileModifyForm', 'TreatmentFileDeletionForm', 'AdministrativeActTreatmentFileForm', 'AdministrativeActTreatmentFileFormSelection', 'AdministrativeActTreatmentFormSelection', diff --git a/archaeological_finds/forms_treatments.py b/archaeological_finds/forms_treatments.py index 44045308f..cc20d6f20 100644 --- a/archaeological_finds/forms_treatments.py +++ b/archaeological_finds/forms_treatments.py @@ -208,12 +208,18 @@ class BaseTreatmentForm(ManageOldType, forms.Form): """ -class ModifyTreatmentForm(BaseTreatmentForm): +class TreatmentModifyForm(BaseTreatmentForm): index = forms.IntegerField(_(u"Index")) id = forms.IntegerField(' ', widget=forms.HiddenInput, required=False) + def __init__(self, *args, **kwargs): + super(TreatmentModifyForm, self).__init__(*args, **kwargs) + self.fields.keyOrder.pop(self.fields.keyOrder.index('index')) + self.fields.keyOrder.insert( + self.fields.keyOrder.index('year') + 1, 'index') + def clean(self, *args, **kwargs): - super(ModifyTreatmentForm, self).clean(*args, **kwargs) + super(TreatmentModifyForm, self).clean(*args, **kwargs) cleaned_data = self.cleaned_data year = cleaned_data.get('year') pk = cleaned_data.get('id') @@ -424,12 +430,18 @@ class TreatmentFileForm(ManageOldType, forms.Form): self.fields['type'].help_text = models.TreatmentFileType.get_help() -class ModifyTreatmentFileForm(TreatmentFileForm): +class TreatmentFileModifyForm(TreatmentFileForm): index = forms.IntegerField(_(u"Index")) id = forms.IntegerField(' ', widget=forms.HiddenInput, required=False) + def __init__(self, *args, **kwargs): + super(TreatmentFileModifyForm, self).__init__(*args, **kwargs) + self.fields.keyOrder.pop(self.fields.keyOrder.index('index')) + self.fields.keyOrder.insert( + self.fields.keyOrder.index('year') + 1, 'index') + def clean(self, *args, **kwargs): - super(ModifyTreatmentFileForm, self).clean(*args, **kwargs) + super(TreatmentFileModifyForm, self).clean(*args, **kwargs) cleaned_data = self.cleaned_data year = cleaned_data.get('year') pk = cleaned_data.get('id') diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py index 01e579566..52144cadd 100644 --- a/archaeological_finds/views.py +++ b/archaeological_finds/views.py @@ -378,7 +378,7 @@ treatment_creation_wizard = TreatmentWizard.as_view( treatment_modification_wizard = TreatmentModificationWizard.as_view( [('selec-treatment_modification', TreatmentFormSelection), - ('basetreatment-treatment_modification', BaseTreatmentForm), + ('basetreatment-treatment_modification', TreatmentModifyForm), ('final-treatment_modification', FinalForm)], label=_(u"Modify"), url_name='treatment_modification', @@ -470,7 +470,7 @@ treatmentfile_creation_wizard = TreatmentFileWizard.as_view( treatmentfile_modification_wizard = TreatmentFileModificationWizard.as_view( [('selec-treatmentfile_modification', TreatmentFileFormSelection), - ('treatmentfile-treatmentfile_modification', TreatmentFileForm), + ('treatmentfile-treatmentfile_modification', TreatmentFileModifyForm), ('final-treatmentfile_modification', FinalForm)], label=_(u"Modify"), url_name='treatmentfile_modification', |