Merge branch 'v0.9' into wheezy

1 files changed, 10 insertions, 0 deletions

diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py
index 560a1abb3..e288745e2 100644
--- a/ishtar_common/forms_common.py
+++ b/ishtar_common/forms_common.py
@@ -107,6 +107,16 @@ class NewImportForm(forms.ModelForm):
         fields = ('importer_type', 'imported_file', 'imported_images',
                   'conservative_import', 'encoding', 'skip_lines')
 
+    def clean(self):
+        data = self.cleaned_data
+        if data.get('conservative_import', None) \
+                and data.get('importer_type') \
+                and not data.get('importer_type').unicity_keys:
+            raise forms.ValidationError(
+                _(u"This import type have no unicity type defined. "
+                  u"Conservative import is not possible."))
+        return data
+
     def save(self, user, commit=True):
         self.instance.user = user
         return super(NewImportForm, self).save(commit)