Michael Hall has proposed merging lp:~mhall119/loco-directory/683095 into
lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
Related bugs:
#683095 Teams listed multiple times in search
https://bugs.launchpad.net/bugs/683095
--
https://code.launchpad.net/~mhall119/loco-directory/683095/+merge/42232
Your team loco-directory-dev is requested to review the proposed merge of
lp:~mhall119/loco-directory/683095 into lp:loco-directory.
=== modified file 'loco_directory/common/views.py'
--- loco_directory/common/views.py 2010-11-20 17:25:50 +0000
+++ loco_directory/common/views.py 2010-11-30 12:59:56 +0000
@@ -91,29 +91,27 @@
def search_teams(q):
from teams.models import Team
from django.db.models import Q
- team_list = Team.objects.all().order_by('name')
- team_list = team_list.filter(Q(name__icontains=q) | Q(countries__name__icontains=q) | Q(city__icontains=q) | Q(languages__name__icontains=q))
+ team_list = Team.objects.filter(Q(name__icontains=q) | Q(countries__name__icontains=q) | Q(city__icontains=q) | Q(languages__name__icontains=q)).order_by('name').distinct()
return team_list
def search_global_events(q):
from events.models import GlobalEvent
from django.db.models import Q
global_event_list = GlobalEvent.objects.next_events()
- global_event_list = global_event_list.filter(Q(name__icontains=q))
+ global_event_list = global_event_list.filter(Q(name__icontains=q)).distinct()
return global_event_list
def search_team_events(q):
from events.models import TeamEvent
from django.db.models import Q
team_event_list = TeamEvent.objects.next_events()
- team_event_list = team_event_list.filter(Q(name__icontains=q) | Q(teams__name__icontains=q) | Q(venue__name__icontains=q) | Q(venue__city__icontains=q) | Q(venue__country__name__icontains=q) | Q(global_event__name__icontains=q))
+ team_event_list = team_event_list.filter(Q(name__icontains=q) | Q(teams__name__icontains=q) | Q(venue__name__icontains=q) | Q(venue__city__icontains=q) | Q(venue__country__name__icontains=q) | Q(global_event__name__icontains=q)).distinct()
return team_event_list
def search_venues(q):
from venues.models import Venue
from django.db.models import Q
- venue_list = Venue.objects.all().order_by('name')
- venue_list = venue_list.filter(Q(name__icontains=q) | Q(country__name__icontains=q) | Q(city__icontains=q) | Q(address__icontains=q))
+ venue_list = Venue.objects.filter(Q(name__icontains=q) | Q(country__name__icontains=q) | Q(city__icontains=q) | Q(address__icontains=q)).order_by('name').distinct()
return venue_list
_______________________________________________
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
