From ff57cbc9739649952253eb6e42ede6a6fe382e9a Mon Sep 17 00:00:00 2001 From: artunit Date: Tue, 17 Mar 2009 13:43:09 +0000 Subject: [PATCH] added links for charges/discharges git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@194 6d9bc8c9-1ec2-4278-b937-99fde70a366f --- conifer/syrup/views.py | 7 ++++--- conifer/templates/admin/index.xhtml | 5 +++++ conifer/templates/zsearch_results.xhtml | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/conifer/syrup/views.py b/conifer/syrup/views.py index 9816038..3c39d2f 100644 --- a/conifer/syrup/views.py +++ b/conifer/syrup/views.py @@ -849,7 +849,6 @@ def zsearch(request): 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 @@ def zsearch(request): 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 @@ def zsearch(request): 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) #----------------------------------------------------------------------------- diff --git a/conifer/templates/admin/index.xhtml b/conifer/templates/admin/index.xhtml index ebe9aa2..84397b4 100644 --- a/conifer/templates/admin/index.xhtml +++ b/conifer/templates/admin/index.xhtml @@ -11,11 +11,16 @@ title = _('Administrative Options')

${title}

+ +