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/32107
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/views.py'
--- loco_directory/events/views.py 2010-08-05 16:34:30 +0000
+++ loco_directory/events/views.py 2010-08-09 13:59:41 +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
@@ -358,10 +358,30 @@
add_team_event = (request.user and request.user.is_authenticated() and \
request.user.groups.exclude(name__exact='ubuntu-lococouncil'))
is_on_lc = launchpad.is_user_on_loco_council(request.user)
+
+ events_without_venue = global_event_object.teamevent_set.filter(venue__isnull=True)
+ events_without_continent = global_event_object.teamevent_set.filter(venue__country__continents__isnull=True)
+ country_ids = [a.venue.country.id for a in global_event_object.teamevent_set.filter(venue__isnull=False,
+ venue__country__continents__isnull=False)]
+ country_without_continents_ids = [a.venue.country.id \
+ for a in global_event_object.teamevent_set.filter(venue__isnull=False,
+ venue__country__continents__isnull=True)]
+
+ countries = Country.objects.filter(id__in=country_ids).order_by('name')
+ countries_without_continents = Country.objects.filter(id__in=country_without_continents_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,
+ 'events_without_venue': events_without_venue,
+ 'user_is_on_lc': is_on_lc,
+ 'continents': continents,
+ 'countries': countries,
+ 'countries_without_continents': countries_without_continents,
}
return render_to_response('events/global_event_detail.html',
context, RequestContext(request))
=== modified file 'loco_directory/teams/views.py'
--- loco_directory/teams/views.py 2010-08-04 13:25:36 +0000
+++ loco_directory/teams/views.py 2010-08-09 13:59:41 +0000
@@ -68,7 +68,6 @@
"""
team_object = get_object_or_404(Team, lp_name=team_slug)
team_event_list = team_object.teamevent_set.next_events()
- print team_event_list
context = {
'team_object': team_object,
'team_event_list': team_event_list,
@@ -82,7 +81,6 @@
"""
team_object = get_object_or_404(Team, lp_name=team_slug)
team_event_list = team_object.teamevent_set.history_events()
- print team_event_list
context = {
'team_object': team_object,
'team_event_list': team_event_list,
=== 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-08-09 13:59:41 +0000
@@ -1,9 +1,58 @@
{% 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 %}
+
+{% if countries_without_continents %}
+ <li><h2>{% trans "Events in countries without continents" %}</h2>
+ <ul>
+ {% for country in countries_without_continents %}
+ <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>
+ {% endfor %}
+ </ul>
+ </li>
+{% endif %}
+
+{% if events_without_venue %}
+ <li><h2>{% trans "Events without venue" %}</h2>
+ <ul>
+ {% for team_event in events_without_venue %}
+ <li><h3>
+ <a title="{% trans "More Information about Team Event" %}"
+ href="{{ team_event.get_absolute_url }}">{{ team_event.name }}</a>
+ </h3></li>
+ {% endfor %}
+ </ul>
+ </li>
+{% endif %}
</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
