Skip to content
This repository was archived by the owner on Sep 19, 2018. It is now read-only.

Commit 3ae2ec1

Browse files
committed
show ambassadors from your country on index
1 parent b82970b commit 3ae2ec1

File tree

3 files changed

+29
-9
lines changed

3 files changed

+29
-9
lines changed

web/processors/user.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,15 @@ def get_user_profile(user_id):
99
user = User.objects.get(id=user_id)
1010
return user.profile
1111

12-
def get_ambassadors():
12+
def get_ambassadors(country_code=None):
1313
ambassadors = []
14-
aambassadors = User.objects.filter(groups__name='ambassadors').order_by('date_joined')
15-
for ambassador in aambassadors:
16-
ambassadors.append(ambassador.profile)
14+
all_ambassadors = User.objects.filter(groups__name='ambassadors').order_by('date_joined')
15+
for ambassador in all_ambassadors:
16+
if country_code:
17+
if ambassador.profile.country == country_code:
18+
ambassadors.append(ambassador.profile)
19+
else:
20+
ambassadors.append(ambassador.profile)
1721
return ambassadors
1822

1923
def get_ambassadors_for_countries():

web/templates/pages/index.html

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{% extends 'base.html' %}
22
{% load static %}
33
{% load compress %}
4+
{% load avatar_tags %}
45
{% block title %}- Map of Events{% endblock title %}
56

67
{% block social %}
@@ -62,11 +63,22 @@
6263
</div>
6364

6465
<hr />
65-
6666
<div class="how-to">
67-
<a href="{% url 'web.guide' %}" target="_blank" class="btn btn-sm">
68-
How to organize your own event?
67+
<p><strong>Get involved:</strong>
68+
<a href="{% url 'web.guide' %}" class="btn btn-primary btn-sm">
69+
Organize or support events in your city
70+
</a></p>
71+
<p>or
72+
<a href="{% url 'web.ambassadors' %}{% if country %}#{{ country.country_name }}{% endif %}">
73+
contact your <strong>EU Code Week Ambassador{% if ambassadors|length > 1 %}s{% endif %}</strong>
74+
{% if country %}
75+
{% for ambassador in ambassadors %}
76+
{% avatar ambassador.user.username 45 %}
77+
{% endfor %}
78+
{% endif %}
6979
</a>
80+
</p>
81+
7082
</div>
7183
</div>
7284
</div>

web/views/events.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
from web.processors.event import reject_event_status
2424
from web.processors.event import create_or_update_event
2525
from web.processors.user import update_user_email
26+
from web.processors.user import get_ambassadors
2627
from web.processors.event import get_client_ip
2728
from web.processors.event import get_lat_lon_from_user_ip
2829
from web.processors.event import list_countries
@@ -61,16 +62,19 @@ def index(request):
6162
lan_lon = get_lat_lon_from_user_ip(user_ip)
6263
except GeoIPException:
6364
lan_lon = (58.08695, 5.58121)
64-
65+
66+
ambassadors = get_ambassadors(country['country_code'])
6567
all_countries = list_countries()
68+
6669
return render_to_response(
6770
template, {
6871
'map_events': map_events,
6972
'lan_lon': lan_lon,
7073
'country': country,
7174
# all_countries minus two CUSTOM_COUNTRY_ENTRIES
7275
'all_countries': all_countries[2:],
73-
'past': past
76+
'past': past,
77+
'ambassadors': ambassadors,
7478
},
7579
context_instance=RequestContext(request))
7680

0 commit comments

Comments
 (0)