From b1c9523e23c93610973bd39cbf2a45a3275fbb01 Mon Sep 17 00:00:00 2001 From: artunit Date: Fri, 28 Nov 2008 14:59:23 +0000 Subject: [PATCH] git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@65 6d9bc8c9-1ec2-4278-b937-99fde70a366f --- conifer/syrup/models.py | 1 - conifer/syrup/views.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/conifer/syrup/models.py b/conifer/syrup/models.py index 49d8f80..7b601fa 100644 --- a/conifer/syrup/models.py +++ b/conifer/syrup/models.py @@ -252,7 +252,6 @@ class Item(m.Model): def __unicode__(self): return self.title - #------------------------------------------------------------ class NewsItem(m.Model): diff --git a/conifer/syrup/views.py b/conifer/syrup/views.py index bf17fdb..078b94a 100644 --- a/conifer/syrup/views.py +++ b/conifer/syrup/views.py @@ -149,8 +149,8 @@ def search(request): count = int(request.GET.get('count', 5)) if ('q' in request.GET) and request.GET['q'].strip(): query_string = request.GET['q'] - entry_query = get_query(query_string, ['title', 'enrol_codes',]) - paginator = Paginator( models.Course.objects.filter(entry_query).order_by('-title'), + entry_query = get_query(query_string, ['title', 'author', 'course__title', 'course__department__name',]) + paginator = Paginator( models.Item.objects.filter(entry_query).order_by('-date_created'), count) return g.render('search_results.xhtml', paginator=paginator, -- 2.11.0