Merge remote-tracking branch 'upstream/master'

Author: ViaCoco

codeweekeu/settings.py

@@ -436,7 +436,6 @@
 	u'PY': None,
 	u'QA': None,
 	u'RE': None,
-	u'RS': None,
 	u'RU': None,
 	u'RW': None,
 	u'SA': None,
@@ -491,6 +490,7 @@
 	u'ZA': None,
 	u'ZM': None,
 	u'ZW': None,
+	u'XK': 'Kosovo',
 }
 ########## END ATHENTICATION CONFIGURATION
 

codeweekeu/settings_production.py

@@ -3,6 +3,13 @@
 
 DEBUG = False
 
+ADMINS = (
+	('Codeweek','[email protected]'),
+	('Goran','[email protected]'),
+	('Erika', '[email protected]'),
+	('Mateja', '[email protected]')
+)
+
 dbconfig = dj_database_url.config()
 if dbconfig:
 	DATABASES['default'] =  dbconfig

static/flags/rs.png

@@ -75,10 +75,12 @@ var Codeweek = window.Codeweek || {};
 	function updateAddress(new_latLng) {
 		geocoder = new google.maps.Geocoder();
 		geocoder.geocode({'latLng': new_latLng}, function (results, status) {
-			if (status === google.maps.GeocoderStatus.OK) {
+			if ( status === google.maps.GeocoderStatus.OK ||
+				 ( status === google.maps.GeocoderStatus.ZERO_RESULTS && results.length > 0 ) ) {
 				document.getElementById("autocomplete").value = results[0].formatted_address;
 				// the last item in the geocoder for latLng results array is the country
-				var country = results[results.length - 1].address_components[0].short_name
+				var country = results.slice(-1)[0].address_components.slice(-1)[0].short_name;
+
 				updateCountrySelection(country);
 			}
 		});

static/js/events.js

@@ -161,8 +161,8 @@ class SearchEventForm(forms.Form):
 
 	# XK is temp code for Kosovo; remove from COUNTRIES_OVERRIDE when 
 	# Kosovo gets its own ISO code and is added to django-countries
-	#if not 'Kosovo' in list(dict(countries._countries).values()):
-	#	countries._countries.append((u'XK', u'Kosovo'))
+	if not 'Kosovo' in list(dict(countries._countries).values()):
+		countries._countries.append((u'XK', u'Kosovo'))
 
 	search = forms.CharField(
 		required=False,

web/forms/event_form.py

@@ -345,6 +345,50 @@ def test_create_event_in_moldova(admin_user, db):
 
 	assert "MD" == test_event.country.code
 
+@pytest.mark.django_db
+def test_create_event_in_kosovo(admin_user, db):
+	event_data = {
+		'audience': [3],
+		'theme': [1,2],
+		'contact_person': u'[email protected]',
+		'country': u'XK',
+		'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'Shaban Polluzha, Prishtina, Kosova (Kosovo)',
+		'organizer': u'RailsGirls Kosovo',
+		"creator": admin_user,
+		'start_date': datetime.datetime.now(),
+		'end_date': datetime.datetime.now() + datetime.timedelta(days=3, hours=3),
+		'tags': [u'css', u'html', u'web'],
+		'title': u'RailsGirls Kosovo',
+	}
+
+	test_event = create_or_update_event(event_id=None, **event_data)
+
+	assert "XK" == test_event.country.code
+
+@pytest.mark.django_db
+def test_create_event_in_serbia(admin_user, db):
+	event_data = {
+		'audience': [3],
+		'theme': [1,2],
+		'contact_person': u'[email protected]',
+		'country': u'RS',
+		'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'96 Bulevar despota Stefana, Belgrade, Serbia',
+		'organizer': u'RailsGirls Serbia',
+		"creator": admin_user,
+		'start_date': datetime.datetime.now(),
+		'end_date': datetime.datetime.now() + datetime.timedelta(days=3, hours=3),
+		'tags': [u'css', u'html', u'web'],
+		'title': u'RailsGirls Serbia',
+	}
+
+	test_event = create_or_update_event(event_id=None, **event_data)
+
+	assert "RS" == test_event.country.code
+
 @pytest.mark.django_db
 def test_scoreboard_counter(admin_user, db):
 
@@ -406,5 +450,3 @@ def test_scoreboard_counter(admin_user, db):
 
 	test_approved_event.delete()
 	test_pending_event.delete()
-
-

web/tests/test_events_processors.py

@@ -77,43 +77,42 @@ def index(request):
 
 @login_required
 def add_event(request):
-	event_form = AddEventForm(initial={'user_email': request.user.email})
-	user = request.user
-
 	if request.method == 'POST':
 		event_form = AddEventForm(data=request.POST, files=request.FILES)
 
-	if event_form.is_valid():
-		picture = request.FILES.get('picture', None)
-		event_data = {}
-		try:
-			if picture:
-				if picture.size > (256 * 1024):
-					raise ImageSizeTooLargeException('Image size too large.')
+		if event_form.is_valid():
+			picture = request.FILES.get('picture', None)
+			event_data = {}
+			try:
+				if picture:
+					if picture.size > (256 * 1024):
+						raise ImageSizeTooLargeException('Image size too large.')
 
-				event_data['picture'] = process_image(picture)
+					event_data['picture'] = process_image(picture)
 
-			event_data.update(event_form.cleaned_data)
-			event_data['creator'] = user
+				event_data.update(event_form.cleaned_data)
+				event_data['creator'] = request.user
 
-			# checking if user entered a different email than in her profile
-			if user.email != event_data['user_email']:
-				update_user_email(user.id, event_data['user_email'])
-			event_data.pop('user_email')
+				# checking if user entered a different email than in her profile
+				if request.user.email != event_data['user_email']:
+					update_user_email(request.user.id, event_data['user_email'])
+				event_data.pop('user_email')
 
-			event = create_or_update_event(**event_data)
+				event = create_or_update_event(**event_data)
 
-			t = loader.get_template('alerts/thank_you.html')
-			c = Context({'event': event, })
-			messages.info(request, t.render(c))
+				t = loader.get_template('alerts/thank_you.html')
+				c = Context({'event': event, })
+				messages.info(request, t.render(c))
 
-			return HttpResponseRedirect(reverse('web.view_event', args=[event.pk, event.slug]))
+				return HttpResponseRedirect(reverse('web.view_event', args=[event.pk, event.slug]))
 
-		except ImageSizeTooLargeException:
-			messages.error(request, 'The image is just a bit too big for us. '
-			                        'Please reduce your image size and try agin.')
-		except UploadImageError as e:
-			messages.error(request, e.message)
+			except ImageSizeTooLargeException:
+				messages.error(request, 'The image is just a bit too big for us. '
+				                        'Please reduce your image size and try agin.')
+			except UploadImageError as e:
+				messages.error(request, e.message)
+	else:
+		event_form = AddEventForm(initial={'user_email': request.user.email})
 
 	return render_to_response("pages/add_event.html", {
 		'form': event_form,