From c439d12dba8e83189085f533820390e77802f07e Mon Sep 17 00:00:00 2001
From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Fri, 15 Feb 2008 17:26:37 +0000
Subject: [PATCH] fixed redirect bug in picklist update.  hiding serials/admin
 links for now since they do not lead to anything

git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@8756 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/web/oilsweb/oilsweb/controllers/acq/picklist.py          | 6 ++++--
 Open-ILS/web/oilsweb/oilsweb/templates/oils/default/navigate.html | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Open-ILS/web/oilsweb/oilsweb/controllers/acq/picklist.py b/Open-ILS/web/oilsweb/oilsweb/controllers/acq/picklist.py
index cde2df5b31..8b314422a2 100644
--- a/Open-ILS/web/oilsweb/oilsweb/controllers/acq/picklist.py
+++ b/Open-ILS/web/oilsweb/oilsweb/controllers/acq/picklist.py
@@ -93,12 +93,14 @@ class PicklistController(BaseController):
         r = RequestMgr()
         ses = ClientSession(oils.const.OILS_APP_ACQ)
         ses.connect()
-
-        page = redirect_to(controller='acq/picklist', action='list')
+        page = None
 
         if r.ctx.acq.picklist_action == 'move_selected':
             page = self._move_selected(r, ses)
 
+        if not page:
+            page = redirect_to(controller='acq/picklist', action='list')
+
         ses.disconnect()
         return page
 
diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/navigate.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/navigate.html
index 5243d08fac..b725d3a5e4 100644
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/navigate.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/navigate.html
@@ -11,9 +11,11 @@
             <%include file='acq/navigate.html'/>
         </div>
     % endif
+    <!--
     <div class='oils-base-navigate-item'>
         <a href='${c.oils.core.prefix}/ser/index'>${_('Serials')}</a>
     </div>
+    -->
     <div class='oils-base-navigate-item'>
         <a href='${c.oils.core.prefix}/admin/index'>${_('Admin')}</a>
     </div>
-- 
2.11.0