[open-ils-commits] r8756 - in branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb: controllers/acq templates/oils/default

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-02-15 12:26:37 -0500 (Fri, 15 Feb 2008)
New Revision: 8756

Modified:
   branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/picklist.py
   branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/navigate.html
Log:
fixed redirect bug in picklist update.  hiding serials/admin links for now since they do not lead to anything

Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/picklist.py
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/picklist.py	2008-02-15 02:41:35 UTC (rev 8755)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq/picklist.py	2008-02-15 17:26:37 UTC (rev 8756)
@@ -93,12 +93,14 @@
         r = RequestMgr()
         ses = ClientSession(oils.const.OILS_APP_ACQ)
         ses.connect()
+        page = None
 
-        page = redirect_to(controller='acq/picklist', action='list')
-
         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
 

Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/navigate.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/navigate.html	2008-02-15 02:41:35 UTC (rev 8755)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/navigate.html	2008-02-15 17:26:37 UTC (rev 8756)
@@ -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>