fixed redirect bug in picklist update. hiding serials/admin links for now since...

git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@8756 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/oilsweb/oilsweb/controllers/acq/picklist.py b/Open-ILS/web/oilsweb/oilsweb/controllers/acq/picklist.py
index cde2df5..8b31442 100644 (file)
--- 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 5243d08..b725d3a 100644 (file)
--- 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>