From: artunit Date: Tue, 16 Dec 2008 20:54:35 +0000 (+0000) Subject: git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@84 6d9bc8c9-1ec2-4278... X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=13c77c71327767911833507b99266df43f89af58;p=syrup%2Fmasslnc.git git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@84 6d9bc8c9-1ec2-4278-b937-99fde70a366f --- diff --git a/conifer/syrup/views.py b/conifer/syrup/views.py index e3e337a..8617788 100644 --- a/conifer/syrup/views.py +++ b/conifer/syrup/views.py @@ -158,6 +158,7 @@ def search(request): page_num = int(request.GET.get('page', 1)) count = int(request.GET.get('count', 5)) norm_query = '' + query_string = '' #TODO: need to block or do something useful with blank query (seems dumb to do entire list) @@ -188,7 +189,6 @@ def search(request): instructor_list = models.Member.objects.filter(instr_query).filter(role='INSTR').order_by('user__last_name')[0:5] instr_len = len(models.Member.objects.filter(instr_query).filter(role='INSTR')) else: - query_string = 'no query specified' paginator = Paginator( models.Item.objects.order_by('-date_created'), count) course_list = models.Course.objects.filter(active=True).order_by('title')[0:5] diff --git a/conifer/templates/search_results.xhtml b/conifer/templates/search_results.xhtml index 84282a7..5713af5 100644 --- a/conifer/templates/search_results.xhtml +++ b/conifer/templates/search_results.xhtml @@ -15,8 +15,12 @@ instructors = instructor_list -

${title}

-

You searched: ${query_string}

+

${title}

+ +

+ You searched: ${query_string} +

+

No. of instructors: ${instr_len}