Merge lp:~mhall119/loco-team-portal/fixes-641345 into lp:loco-team-portal

Proposed by Michael Hall
Status: Merged
Merged at revision: 294
Proposed branch: lp:~mhall119/loco-team-portal/fixes-641345
Merge into: lp:loco-team-portal
Diff against target: 11 lines (+1/-0)
1 file modified
loco_directory/events/views.py (+1/-0)
To merge this branch: bzr merge lp:~mhall119/loco-team-portal/fixes-641345
Reviewer Review Type Date Requested Status
Dave Walker Approve
Review via email: mp+35837@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Dave Walker (davewalker) wrote :

Well caught! Merging...

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py 2010-08-24 15:24:24 +0000
+++ loco_directory/events/views.py 2010-09-17 14:46:43 +0000
@@ -381,6 +381,7 @@
381 venue__country__continents__isnull=False)]381 venue__country__continents__isnull=False)]
382 country_without_continents_ids = [a.venue.country.id \382 country_without_continents_ids = [a.venue.country.id \
383 for a in global_event_object.teamevent_set.filter(venue__isnull=False,383 for a in global_event_object.teamevent_set.filter(venue__isnull=False,
384 venue__country__isnull=False,
384 venue__country__continents__isnull=True)]385 venue__country__continents__isnull=True)]
385386
386 countries = Country.objects.filter(id__in=country_ids).order_by('name')387 countries = Country.objects.filter(id__in=country_ids).order_by('name')

Subscribers

People subscribed via source and target branches