Treatment / File treatment: can modify index

1 files changed, 16 insertions, 4 deletions

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')