Daniel Holbach has proposed merging lp:~dholbach/loco-directory/607638 into
lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
Related bugs:
#607638 Split up global events by country/continent
https://bugs.launchpad.net/bugs/607638
--
https://code.launchpad.net/~dholbach/loco-directory/607638/+merge/30498
Your team loco-directory-dev is requested to review the proposed merge of
lp:~dholbach/loco-directory/607638 into lp:loco-directory.
=== modified file 'loco_directory/events/forms.py'
--- loco_directory/events/forms.py 2010-06-19 21:35:39 +0000
+++ loco_directory/events/forms.py 2010-07-21 09:36:53 +0000
@@ -6,8 +6,6 @@
from models import BaseEvent, GlobalEvent, TeamEvent, Attendee, TeamEventComment
from venues.models import Venue
-import re
-
def validate_tag(tag):
if tag.startswith('#'):
tag = tag[1:]
=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py 2010-06-19 21:35:39 +0000
+++ loco_directory/events/views.py 2010-07-21 09:36:53 +0000
@@ -7,7 +7,7 @@
from events.models import TeamEvent
from events.models import GlobalEvent
-from teams.models import Team
+from teams.models import Team, Country, Continent
from events.models import Attendee
from forms import TeamEventForm
@@ -317,10 +317,21 @@
add_team_event = (request.user and request.user.is_authenticated() and \
request.user.groups.exclude(name__exact='ubuntu-lococouncil'))
is_on_lc = request.user.is_authenticated() and launchpad.is_user_on_loco_council(request.user)
+
+ country_ids = [a.venue.country.id for a in global_event_object.teamevent_set.all()]
+ countries = Country.objects.filter(id__in=country_ids).order_by('name')
+
+ continent_ids = []
+ for continent_list in map(lambda a: a.continents.all(), countries):
+ continent_ids += [continent.id for continent in continent_list]
+ continents = Continent.objects.filter(id__in=continent_ids).order_by('name')
+
context = {
'global_event_object': global_event_object,
'add_team_event': add_team_event,
- 'user_is_on_lc': is_on_lc,
+ 'user_is_on_lc': is_on_lc,
+ 'continents': continents,
+ 'countries': countries,
}
return render_to_response('events/global_event_detail.html',
context, RequestContext(request))
=== modified file 'loco_directory/teams/management/commands/import-translations.py'
--- loco_directory/teams/management/commands/import-translations.py 2009-12-23 10:35:20 +0000
+++ loco_directory/teams/management/commands/import-translations.py 2010-07-21 09:36:53 +0000
@@ -32,7 +32,7 @@
subprocess.call(["cp", pofile,
os.path.join(project_locale_path,
"LC_MESSAGES/django.po")])
-
+
class Command(LabelCommand):
help = "Import translations from a translations tarball, that was downloaded from Launchpad."
=== modified file 'loco_directory/teams/views.py'
--- loco_directory/teams/views.py 2010-07-15 13:37:00 +0000
+++ loco_directory/teams/views.py 2010-07-21 09:36:53 +0000
@@ -1,7 +1,6 @@
# -*- coding: utf-8 -*-
from django.template import RequestContext
-from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ugettext
from django.core import serializers
=== modified file 'loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html'
--- loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html 2010-06-03 17:35:10 +0000
+++ loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html 2010-07-21 09:36:53 +0000
@@ -1,9 +1,26 @@
{% load i18n %}
{% if global_event_object.teamevent_set.all %}
<ul id="global-event-attending-teamevents">
- {% for team_event in global_event_object.teamevent_set.all %}
- <li class="{% cycle 'col_left' 'col_right' %}"><a title="{% trans "More Information about Team Event" %}" href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a></li>
- {% endfor %}
+
+{% for continent in continents %}
+ <li><h2>{{ continent.name }}</h2>
+ <ul>
+ {% for country in countries %}{% for cont in country.continents.all %}{% ifequal cont continent %}
+ <li>
+ <h2>{{ country.name }}</h2>
+ <ul>
+ {% for team_event in global_event_object.teamevent_set.all %}{% ifequal country team_event.venue.country %}
+ <li><h3>
+ <a title="{% trans "More Information about Team Event" %}"
+ href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>
+ </h3></li>
+ {% endifequal %}{% endfor %}
+ </ul>
+ </li>
+ {% endifequal %}{% endfor %}{% endfor %}
+ </ul>
+ </li>
+{% endfor %}
</ul>
<br class="clear" />
{% endif %}
_______________________________________________
Mailing list: https://launchpad.net/~loco-directory-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~loco-directory-dev
More help : https://help.launchpad.net/ListHelp
