[open-ils-commits] r194 - in servres/trunk/conifer: syrup templates templates/admin (artunit)

Tue Mar 17 09:43:11 EDT 2009

Author: artunit
Date: 2009-03-17 09:43:09 -0400 (Tue, 17 Mar 2009)
New Revision: 194

Modified:
   servres/trunk/conifer/syrup/views.py
   servres/trunk/conifer/templates/admin/index.xhtml
   servres/trunk/conifer/templates/zsearch_results.xhtml
Log:
added links for charges/discharges

Modified: servres/trunk/conifer/syrup/views.py
===================================================================

--- servres/trunk/conifer/syrup/views.py	2009-03-17 13:16:45 UTC (rev 193)
+++ servres/trunk/conifer/syrup/views.py	2009-03-17 13:43:09 UTC (rev 194)
@@ -849,7 +849,6 @@
         start = (page_num - 1) * count
         end = (page_num * count) + 1
         for r in res[0: start]:
-                print("none")
                 collector.append ((None, None))
         for r in res[start + 1: end]:
             if r.syntax <> 'USMARC':
@@ -885,7 +884,6 @@
                 collector.append ((bibid, unicode(title, 'ascii', 'ignore')))
         if end < len(res):
             for r in res[end + 1:len(res)]:
-                    print("end none")
                     collector.append ((None, None))
         conn.close ()
         # print("done searching...")
@@ -893,7 +891,10 @@
 
     print("page_num is %d" % page_num)
     print("returning...")
-    return g.render('zsearch_results.xhtml', **locals())
+    #return g.render('zsearch_results.xhtml', **locals())
+    return g.render('zsearch_results.xhtml', paginator=paginator,
+                    page_num=page_num,
+                    count=count, target=target, tquery=tquery)
 
 
 #-----------------------------------------------------------------------------

Modified: servres/trunk/conifer/templates/admin/index.xhtml
===================================================================
--- servres/trunk/conifer/templates/admin/index.xhtml	2009-03-17 13:16:45 UTC (rev 193)
+++ servres/trunk/conifer/templates/admin/index.xhtml	2009-03-17 13:43:09 UTC (rev 194)
@@ -11,11 +11,16 @@
 <body>
   <h1>${title}</h1>
   <ul>
+    <li><a href="checkout/">Charge/Discharge</a></li>
+  </ul>
+  <ul>
     <li><a href="terms/">Terms</a></li>
     <li><a href="depts/">Departments</a></li>
     <li><a href="courses/">Courses</a></li>
     <li><a href="items/">Items</a></li>
     <li><a href="news/">News Items</a></li>
+  </ul>
+  <ul>
     <li><a href="targets/">Manage Z39.50 Targets</a></li>
     <!-- not sure if this is an admin option yet -->
     <li><a href="../zsearch/">Search Z39.50 Targets</a></li>

Modified: servres/trunk/conifer/templates/zsearch_results.xhtml
===================================================================
--- servres/trunk/conifer/templates/zsearch_results.xhtml	2009-03-17 13:16:45 UTC (rev 193)
+++ servres/trunk/conifer/templates/zsearch_results.xhtml	2009-03-17 13:43:09 UTC (rev 194)
@@ -1,6 +1,6 @@
 <?python
 title = _('Z39.50 Search Results')
-title_list = collector
+#title_list = collector
 ?>
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:xi="http://www.w3.org/2001/XInclude"

