Treatment - packaging: change by default current and ref container

1 files changed, 14 insertions, 14 deletions

diff --git a/archaeological_finds/forms_treatments.py b/archaeological_finds/forms_treatments.py
index 8ae0dbd36..59df12df2 100644
--- a/archaeological_finds/forms_treatments.py
+++ b/archaeological_finds/forms_treatments.py
@@ -195,10 +195,20 @@ class BaseTreatmentForm(CustomForm, ManageOldType):
     def clean(self, *args, **kwargs):
         data = self.cleaned_data
 
-        treatment_types = data.get('treatment_type', [])
+        try:
+            treatment_types = [
+                models.TreatmentType.objects.get(
+                    pk=pk, available=True, upstream_is_many=False,
+                    downstream_is_many=False)
+                for pk in data.get('treatment_type', [])]
+        except models.TreatmentType.DoesNotExist:
+            raise forms.ValidationError(_(u"Unknow treatment type"))
+
 
         change_current_location = [
-            unicode(tp) for tp in treatment_types if tp.change_current_location]
+            unicode(tp) for tp in treatment_types
+            if tp.change_current_location
+        ]
         restore_reference_location = [
             unicode(tp) for tp in treatment_types
             if tp.restore_reference_location
@@ -214,7 +224,7 @@ class BaseTreatmentForm(CustomForm, ManageOldType):
                 raise forms.ValidationError(
                     unicode(
                         _(u"{} is not compatible with {} "
-                          u"treatments.")).format(
+                          u"treatment(s).")).format(
                         u' ; '.join(restore_reference_location),
                         u' ; '.join(change_ref_location),
                     )
@@ -223,22 +233,12 @@ class BaseTreatmentForm(CustomForm, ManageOldType):
                 raise forms.ValidationError(
                     unicode(
                         _(u"{} is not compatible with {} "
-                          u"treatments.")).format(
+                          u"treatment(s).")).format(
                         u' ; '.join(restore_reference_location),
                         u' ; '.join(change_current_location)
                     )
                 )
 
-        if change_ref_location and change_current_location:
-            raise forms.ValidationError(
-                unicode(
-                    _(u"{} is not compatible with {} "
-                      u"treatments.")).format(
-                    u' ; '.join(change_ref_location),
-                    u' ; '.join(change_current_location)
-                )
-            )
-
         if data.get('container', None) \
                 and not change_ref_location\
                 and not change_current_location: