Merge pull request #403 from gandalfar/patch-sentry-645

Fixes crash when deleting one of the dates when editing event

Author: goranche

web/forms/event_form.py

@@ -144,7 +144,7 @@ def clean(self):
 		start_date = cleaned_data.get('start_date')
 		end_date = cleaned_data.get('end_date')
 
-		if end_date < start_date:
+		if start_date and end_date and end_date < start_date:
 			msg = u'End date should be greater than start date.'
 			self._errors['end_date'] = self.error_class([msg])
 
@@ -153,7 +153,6 @@ def clean(self):
 	def __init__(self, *args, **kwargs):
 		super(AddEventForm, self).__init__(*args, **kwargs)
 
-
 class SearchEventForm(forms.Form):
 
 	countries._countries.append(Event.CUSTOM_COUNTRY_ENTRIES[0])

web/tests/test_event_views.py

@@ -228,6 +228,34 @@ def test_edit_event_with_image(admin_user, admin_client, db):
 	assert 'event_picture/ercchy' not in response.content
 
 
+@pytest.mark.django_db
+def test_edit_event_without_end_date(db, admin_user, admin_client):
+	event = EventFactory.create(creator=admin_user)
+
+	event_data = {
+		'audience': [6, 7],
+		'theme': [3,4],
+		'contact_person': u'[email protected]',
+		'country': u'SI',
+		'description': u'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod\r\ntempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,\r\nquis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo\r\nconsequat. Duis aute irure dolor in reprehenderit in voluptate velit esse\r\ncillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non\r\nproident, sunt in culpa qui officia deserunt mollit anim id est laborum.',
+		'event_url': u'',
+		'location': u'Ljubljana, Slovenia',
+		'organizer': u'Mozilla Slovenija',
+		'picture': '',
+		'start_date': datetime.datetime.now(),
+		'end_date': '',
+		'tags': [u'css', u'html', u'web'],
+		'title': u'Webmaker Ljubljana',
+		'user_email': u'[email protected]'
+	}
+
+	response_edited = admin_client.post(reverse('web.edit_event', args=[event.id]), event_data)
+
+	assert response_edited.status_code == 200
+	assert 'end_date' in response_edited.context['form'].errors
+
+	event.delete()
+
 @pytest.mark.django_db
 def test_scoreboard_links_and_results(admin_user, db, client):