git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@65 6d9bc8c9-1ec2-4278...

diff --git a/conifer/syrup/models.py b/conifer/syrup/models.py
index 49d8f80..7b601fa 100644 (file)
--- 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 (file)
--- 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,