Merge branch 'master' into saclay

Conflicts:
	chimere/locale/fr/LC_MESSAGES/django.po
	chimere/templates/chimere/blocks/multimedia_file.html
	chimere/templates/chimere/detail.html
	chimere/templatetags/chimere_tags.py
	chimere/views.py

1 files changed, 7 insertions, 5 deletions

diff --git a/chimere/forms.py b/chimere/forms.py
index ef2d3fb..5c759c9 100644
--- a/chimere/forms.py
+++ b/chimere/forms.py
@@ -200,14 +200,16 @@ class MarkerAdminFormBase(forms.ModelForm):
         Verify the mandatory properties (to be check manualy because it depends
         on the checked categories)
         '''
-        if not settings.CHIMERE_DAYS_BEFORE_EVENT:
-            return self.cleaned_data
-        if self.cleaned_data['end_date'] and \
-           not self.cleaned_data['start_date']:
+        start_date = self.cleaned_data.get('start_date')
+        end_date = self.cleaned_data.get('end_date')
+        if end_date and not start_date:
             msg = _(u"End date has been set with no start date")
             self._errors["end_date"] = self.error_class([msg])
             del self.cleaned_data['end_date']
-
+        if end_date and start_date and start_date > end_date:
+            msg = _(u"End date can't be before start date")
+            self._errors["end_date"] = self.error_class([msg])
+            raise forms.ValidationError(msg)
         for pm in self.pms:
             if not pm.mandatory or self.cleaned_data[pm.getNamedId()]:
                 continue