Merge pull request #261 from ialja/master

remove CUSTOM_COUNTRY_ENTRIES from country list on index and ambassadors

Author: ercchy

web/processors/user.py

@@ -19,7 +19,8 @@ def get_ambassadors():
 def get_ambassadors_for_countries():
 	ambassadors = get_ambassadors()
 	countries_ambassadors = []
-	for code, name in list(countries):
+	# list countries minus two CUSTOM_COUNTRY_ENTRIES
+	for code, name in list(countries)[2:]:
 		readable_name = unicode(name)
 		found_ambassadors = []
 		for ambassador in ambassadors:

web/views/events.py

@@ -68,7 +68,8 @@ def index(request):
 			'map_events': map_events,
 			'lan_lon': lan_lon,
 			'country': country,
-			'all_countries': all_countries,
+			# all_countries minus two CUSTOM_COUNTRY_ENTRIES
+			'all_countries': all_countries[2:],
 			'past': past
 		},
 		context_instance=RequestContext(request))