Merge remote-tracking branch 'upstream/master'

Author: ViaCoco

web/processors/event.py

@@ -12,10 +12,6 @@
 
 
 def get_client_ip(forwarded=None, remote=None):
-
-	if settings.DEBUG:
-		return '93.103.53.11'
-
 	if forwarded:
 		return forwarded.split(',')[0]
 	return remote

web/templates/pages/index.html

@@ -42,11 +42,16 @@
 			</div>
 			<div class="clearfix">
 				<div id="search-events-link">
-					<a class="btn btn-primary btn-lg"
-					   href="{% url 'web.search_events' %}?country_code={{ country.country_code }}&amp;past={{ past }}">
-						<i class="fa fa-list"></i> List all events {% if country %}in
-						<span id="country"> {{ country.country_name }}</span>{% endif %}
-					</a>
+					{% if country.country_code %}
+						<a class="btn btn-primary btn-lg"
+							href="{% url 'web.search_events' %}?country_code={{ country.country_code }}&amp;past={{ past }}">
+						   <i class="fa fa-list"></i> List all events in <span id="country"> {{ country.country_name }}</span>
+						</a>
+					{% else %}
+						<a class="btn btn-primary btn-lg" href="{% url 'web.search_events' %}">
+							<i class="fa fa-list"></i> List all events
+						</a>
+					{% endif %}
 				</div>
 			</div>
 

web/tests/test_event_views.py

@@ -235,6 +235,19 @@ def test_nonexistent_event(db, client):
 
 	assert response.status_code == 404
 
+@pytest.mark.django_db
+def test_geoip_slovenian_ip(db, client):
+	response = client.get('/', REMOTE_ADDR='93.103.53.1')
+
+	assert 'List all events in <span id="country"> Slovenia' in response.content
+
+@pytest.mark.django_db
+def test_geoip_invalid_ip(db, client):
+	response = client.get('/', REMOTE_ADDR='127.0.0.1')
+
+	assert 'List all events' in response.content
+	assert 'List all events <span' not in response.content
+
 @pytest.mark.django_db
 def test_list_events_for_country_code(db, client):
 	response = client.get(reverse('web.view_event_by_country', args=['SI']))

web/views/events.py

@@ -58,7 +58,7 @@ def index(request):
 	country = get_country_from_user_ip(user_ip)
 
 	try:
-		lan_lon = get_lat_lon_from_user_ip(user_ip)
+		lan_lon = get_lat_lon_from_user_ip(user_ip) or (58.08695, 5.58121)
 	except GeoIPException:
 		lan_lon = (58.08695, 5.58121)