Django 1.8: keyOrder -> OrderedDict

1 files changed, 23 insertions, 10 deletions

diff --git a/archaeological_finds/forms_treatments.py b/archaeological_finds/forms_treatments.py
index 52971bf6d..30d8e51ae 100644
--- a/archaeological_finds/forms_treatments.py
+++ b/archaeological_finds/forms_treatments.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2016  Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2016-2017  Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -17,6 +17,7 @@
 
 # See the file COPYING for details.
 
+from collections import OrderedDict
 import datetime
 import logging
 
@@ -192,9 +193,13 @@ class BaseTreatmentForm(ManageOldType, forms.Form):
         self.fields['basket'].required = False
         self.fields['basket'].help_text = \
             _(u"Leave it blank if you want to select a single item")
-        self.fields.keyOrder.pop(self.fields.keyOrder.index('basket'))
-        self.fields.keyOrder.insert(self.fields.keyOrder.index('description'),
-                                    'basket')
+        fields = OrderedDict()
+        basket = self.fields.pop('basket')
+        for key, value in self.fields.items():
+            if key == 'description':
+                fields['index'] = basket
+            fields[key] = value
+        self.fields = fields
         """
 
     def clean(self, *args, **kwargs):
@@ -239,9 +244,13 @@ class TreatmentModifyForm(BaseTreatmentForm):
 
     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')
+        fields = OrderedDict()
+        idx = self.fields.pop('index')
+        for key, value in self.fields.items():
+            fields[key] = value
+            if key == 'year':
+                fields['index'] = idx
+        self.fields = fields
 
     def clean(self, *args, **kwargs):
         super(TreatmentModifyForm, self).clean(*args, **kwargs)
@@ -505,9 +514,13 @@ class TreatmentFileModifyForm(TreatmentFileForm):
 
     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')
+        fields = OrderedDict()
+        idx = self.fields.pop('index')
+        for key, value in self.fields.items():
+            fields[key] = value
+            if key == 'year':
+                fields['index'] = idx
+        self.fields = fields
 
     def clean(self, *args, **kwargs):
         super(TreatmentFileModifyForm, self).clean(*args, **kwargs)