svn commit: r758521 - in /ofbiz/trunk/applications/order/webapp/ordermgr: WEB-INF/controller.xml order/ordershippinginfo.ftl

[jonesde]

Author: jonesde
Date: Thu Mar 26 05:36:45 2009
New Revision: 758521

URL: http://svn.apache.org/viewvc?rev=758521&view=rev
Log:
A number of other links coverted to forms, also fixed various request-redirect responses to have redirect-parameter sub-elements, and changed the error responses to use view instead of request-redirect, which is important because if request-redirect is used on an error the error message and other request attributes will be lost

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=758521&r1=758520&r2=758521&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Thu Mar 26 05:36:45 2009
@@ -96,49 +96,49 @@
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="massChangeOrderApproved"/>
         <response name="success" type="request-redirect" value="findorders"/>
-        <response name="error" type="request-redirect" value="findorders"/>
+        <response name="error" type="view" value="findorders"/>
     </request-map>
     <request-map uri="massProcessOrders">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="massProcessOrders"/>
         <response name="success" type="request-redirect" value="findorders"/>
-        <response name="error" type="request-redirect" value="findorders"/>
+        <response name="error" type="view" value="findorders"/>
     </request-map>
     <request-map uri="massHoldOrders">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="massHoldOrders"/>
         <response name="success" type="request-redirect" value="findorders"/>
-        <response name="error" type="request-redirect" value="findorders"/>
+        <response name="error" type="view" value="findorders"/>
     </request-map>
     <request-map uri="massCancelOrders">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="massCancelOrders"/>
         <response name="success" type="request-redirect" value="findorders"/>
-        <response name="error" type="request-redirect" value="findorders"/>
+        <response name="error" type="view" value="findorders"/>
     </request-map>
     <request-map uri="massRejectOrders">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="massRejectOrders"/>
         <response name="success" type="request-redirect" value="findorders"/>
-        <response name="error" type="request-redirect" value="findorders"/>
+        <response name="error" type="view" value="findorders"/>
     </request-map>
     <request-map uri="massPickOrders">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="massPickOrders"/>
         <response name="success" type="request-redirect" value="findorders"/>
-        <response name="error" type="request-redirect" value="findorders"/>
+        <response name="error" type="view" value="findorders"/>
     </request-map>
     <request-map uri="massPrintOrders">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="massPrintOrders"/>
         <response name="success" type="request-redirect" value="findorders"/>
-        <response name="error" type="request-redirect" value="findorders"/>
+        <response name="error" type="view" value="findorders"/>
     </request-map>
     <request-map uri="massCreateFileForOrders">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="massCreateFileForOrders"/>
         <response name="success" type="request-redirect" value="findorders"/>
-        <response name="error" type="request-redirect" value="findorders"/>
+        <response name="error" type="view" value="findorders"/>
     </request-map>
 
     <!-- Delivery Info Requests, intended for sales orders but can be used for purchase orders as well -->
@@ -241,14 +241,14 @@
     <request-map uri="quickShipOrder">
         <security https="true" auth="true"/>
         <event type="service" invoke="quickShipEntireOrder"/>
-        <response name="success" type="request-redirect" value="orderview"/>
-        <response name="error" type="request-redirect" value="orderview"/>
+        <response name="success" type="request-redirect" value="orderview"><redirect-parameter name="orderId"/></response>
+        <response name="error" type="view" value="orderview"/>
     </request-map>
     <request-map uri="quickDropShipOrder">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="quickDropShipOrder"/>
-        <response name="success" type="request-redirect" value="orderview"/>
-        <response name="error" type="request-redirect" value="orderview"/>
+        <response name="success" type="request-redirect" value="orderview"><redirect-parameter name="orderId"/></response>
+        <response name="error" type="view" value="orderview"/>
     </request-map>
     <request-map uri="completePurchaseOrder">
         <security https="true" auth="true"/>
@@ -322,7 +322,7 @@
     <request-map uri="updateOrderNote">
         <security https="true" auth="true"/>
         <event type="service" invoke="updateOrderNote"/>
-        <response name="success" type="request-redirect" value="orderview"/>
+        <response name="success" type="request-redirect" value="orderview"><redirect-parameter name="orderId"/></response>
         <response name="error" type="view" value="orderview"/>
     </request-map>
     
@@ -1115,14 +1115,14 @@
     <request-map uri="createCustRequestContent">
         <security auth="true" https="true"/>
         <event path="org/ofbiz/order/request/CustRequestEvents.xml" type="simple"  invoke="createCustRequestContent"/>
-        <response name="success" type="request-redirect" value="EditCustRequestContent"/>
+        <response name="success" type="request-redirect" value="EditCustRequestContent"><redirect-parameter name="custRequestId"/></response>
         <response name="error" type="view" value="EditCustRequestContent"/>
     </request-map>
     
     <request-map uri="deleteCustRequestContent">
         <security auth="true" https="true"/>
         <event invoke="deleteCustRequestContent" type="service"/>
-        <response name="success" type="request-redirect" value="EditCustRequestContent"/>
+        <response name="success" type="request-redirect" value="EditCustRequestContent"><redirect-parameter name="custRequestId"/></response>
         <response name="error" type="view" value="EditCustRequestContent"/>
     </request-map>
     
@@ -1448,15 +1448,13 @@
     <request-map uri="authOrderPayment">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="authOrderPaymentPreference"/>
-        <response name="success" type="request-redirect" value="orderview"/>
+        <response name="success" type="request-redirect" value="orderview"><redirect-parameter name="orderId"/></response>
     </request-map>
     
     <request-map uri="updateOrderPaymentPreference">
         <security https="true" auth="true"/>
         <event type="service" invoke="updateOrderPaymentPreference"/>
-        <response name="success" type="request-redirect" value="orderview">
-            <redirect-parameter name="orderId"/>
-        </response>
+        <response name="success" type="request-redirect" value="orderview"><redirect-parameter name="orderId"/></response>
         <response name="error" type="view" value="orderview"/>
     </request-map>
     <request-map uri="setOrderReservationPriority">

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=758521&r1=758520&r2=758521&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Thu Mar 26 05:36:45 2009
@@ -27,7 +27,10 @@
         <#if security.hasEntityPermission("FACILITY", "_CREATE", session) && ((orderHeader.statusId == "ORDER_APPROVED") || (orderHeader.statusId == "ORDER_SENT"))>
           <#-- Special shipment options -->
           <#if orderHeader.orderTypeId == "SALES_ORDER">
-            <li><a href="<@ofbizUrl>quickShipOrder?${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderQuickShipEntireOrder}</a></li>
+            <form name="quickShipOrder" method="post" action="<@ofbizUrl>quickShipOrder</@ofbizUrl>">
+              <input type="hidden" name="orderId" value="${orderId}"/>
+            </form>
+            <li><a href="javascript:document.quickShipOrder.submit()" class="buttontext">${uiLabelMap.OrderQuickShipEntireOrder}</a></li>
           <#else> <#-- PURCHASE_ORDER -->
             <span class="label">&nbsp;<#if orderHeader.orderTypeId == "PURCHASE_ORDER">${uiLabelMap.ProductDestinationFacility}</#if></span>
             <#if ownedFacilities?has_content>
@@ -69,8 +72,20 @@
         </#if>
         <#if security.hasEntityPermission("ORDERMGR", "_RETURN", session) && orderHeader.statusId == "ORDER_COMPLETED">
           <#if returnableItems?has_content>
-            <li><a href="<@ofbizUrl>quickRefundOrder?orderId=${orderId}&amp;receiveReturn=true&amp;returnHeaderTypeId=${returnHeaderTypeId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderQuickRefundEntireOrder}</a></li>
-            <li><a href="<@ofbizUrl>quickreturn?orderId=${orderId}&amp;party_id=${partyId?if_exists}&amp;returnHeaderTypeId=${returnHeaderTypeId}&amp;needsInventoryReceive=${needsInventoryReceive?default("N")}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateReturn}</a></li>
+            <form name="quickRefundOrder" method="post" action="<@ofbizUrl>quickRefundOrder</@ofbizUrl>">
+              <input type="hidden" name="orderId" value="${orderId}"/>
+              <input type="hidden" name="receiveReturn" value="true"/>
+              <input type="hidden" name="returnHeaderTypeId" value="${returnHeaderTypeId}"/>
+            </form>
+            <li><a href="javascript:document.quickRefundOrder.submit()" class="buttontext">${uiLabelMap.OrderQuickRefundEntireOrder}</a></li>
+
+            <form name="quickreturn" method="post" action="<@ofbizUrl>quickreturn</@ofbizUrl>">
+              <input type="hidden" name="orderId" value="${orderId}"/>
+              <input type="hidden" name="party_id" value="${partyId?if_exists}"/>
+              <input type="hidden" name="returnHeaderTypeId" value="${returnHeaderTypeId}"/>
+              <input type="hidden" name="needsInventoryReceive" value="${needsInventoryReceive?default("N")}"/>
+            </form>
+            <li><a href="javascript:document.quickreturn.submit()" class="buttontext">${uiLabelMap.OrderCreateReturn}</a></li>
           </#if>  
         </#if>
 
@@ -243,7 +258,13 @@
                 <#if shipGroup.maySplit?upper_case == "N">
                     ${uiLabelMap.FacilityWaitEntireOrderReady}
                     <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session)>
-                      <#if orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_CANCELLED"><a href="<@ofbizUrl>allowordersplit?shipGroupSeqId=${shipGroup.shipGroupSeqId}&amp;${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderAllowSplit}</a></#if>
+                      <#if orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_CANCELLED">
+                        <form name="allowordersplit_${shipGroup.shipGroupSeqId}" method="post" action="<@ofbizUrl>allowordersplit</@ofbizUrl>">
+                          <input type="hidden" name="orderId" value="${orderId}"/>
+                          <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/>
+                        </form>
+                        <a href="javascript:document.allowordersplit_${shipGroup.shipGroupSeqId}.submit()" class="buttontext">${uiLabelMap.OrderAllowSplit}</a>
+                      </#if>
                     </#if>
                 <#else>
                     ${uiLabelMap.FacilityShipAvailable}