projects / syrup / masslnc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a760ceb)
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@84 6d9bc8c9-1ec2-4278...
authorartunit <artunit@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Tue, 16 Dec 2008 20:54:35 +0000 (20:54 +0000)
committerartunit <artunit@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Tue, 16 Dec 2008 20:54:35 +0000 (20:54 +0000)
conifer/syrup/views.py patch | blob | history
conifer/templates/search_results.xhtml patch | blob | history

diff --git a/conifer/syrup/views.py b/conifer/syrup/views.py
index e3e337a..8617788 100644 (file)
--- 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 (file)
--- a/conifer/templates/search_results.xhtml
+++ b/conifer/templates/search_results.xhtml
@@ -15,8 +15,12 @@ instructors = instructor_list
   </script>
 </head>
 <body>
-  <h1>${title}</h1>
-    <h3>You searched: <i>${query_string}</i></h3>
+<h1>${title}</h1>
+    
+<h3 py:if="query_string">
+    You searched: <i>${query_string}</i>
+</h3>
+
     <p style="font-size: large;">
         No. of instructors: <i> ${instr_len}</i>
     </p>
Syrup working repo (MassLNC)