Michael Hall has proposed merging lp:~mhall119/loco-directory/601947 into
lp:~dholbach/loco-directory/601947.
Requested reviews:
loco-directory-dev (loco-directory-dev)
Set default alphabetic ordering of languages, add language name to searched
fields on team list
--
https://code.launchpad.net/~mhall119/loco-directory/601947/+merge/29988
Your team loco-directory-dev is requested to review the proposed merge of
lp:~mhall119/loco-directory/601947 into lp:~dholbach/loco-directory/601947.
=== modified file 'loco_directory/teams/models.py'
--- loco_directory/teams/models.py 2010-07-09 10:56:40 +0000
+++ loco_directory/teams/models.py 2010-07-15 13:41:48 +0000
@@ -2,6 +2,8 @@
from django.utils.translation import ugettext_lazy as _
class Language(models.Model):
+ class Meta:
+ ordering: ('name',)
name = models.CharField(_("Language"), max_length=150, null=True)
def __unicode__(self):
=== modified file 'loco_directory/teams/views.py'
--- loco_directory/teams/views.py 2010-06-04 14:27:35 +0000
+++ loco_directory/teams/views.py 2010-07-15 13:41:48 +0000
@@ -49,7 +49,7 @@
if form.is_valid():
if form.cleaned_data['q']:
q = form.cleaned_data['q']
- team_list = team_list.filter(Q(name__icontains=q) | Q(countries__name__icontains=q) | Q(city__icontains=q))
+ team_list = team_list.filter(Q(name__icontains=q) | Q(countries__name__icontains=q) | Q(city__icontains=q) | Q(languages__name__icontains=q))
context = {
'team_list': team_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
