svn commit: r796965 - /ofbiz/branches/release09.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl

[ashish]

Author: ashish
Date: Thu Jul 23 06:41:32 2009
New Revision: 796965

URL: http://svn.apache.org/viewvc?rev=796965&view=rev
Log:
Applied fix from trunk revision: 796810.
Applied patch from jira issue OFBIZ-2750 - Secure Url in ordershippinginfo.ftl.
Thanks Pranay for the contribution.

Modified:
    
ofbiz/branches/release09.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl

Modified: 
ofbiz/branches/release09.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=796965&r1=796964&r2=796965&view=diff
==============================================================================
--- 
ofbiz/branches/release09.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
 (original)
+++ 
ofbiz/branches/release09.04/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
 Thu Jul 23 06:41:32 2009
@@ -391,8 +391,20 @@
                     </form>
                     </div>
                <#else>
-                   <a 
href="<@ofbizUrl>quickDropShipOrder?orderId=${orderId}&amp;shipGroupSeqId=${shipGroup.shipGroupSeqId}&amp;externalLoginKey=${externalLoginKey}</@ofbizUrl>"
 class="buttontext" 
target="_blank">${uiLabelMap.ProductShipmentQuickComplete}</a>
-                   <a 
href="/facility/control/createShipment?primaryOrderId=${orderId}&amp;primaryShipGroupSeqId=${shipGroup.shipGroupSeqId}&amp;shipmentTypeId=DROP_SHIPMENT&amp;statusId=PURCH_SHIP_CREATED&amp;externalLoginKey=${externalLoginKey}"
 class="buttontext">${uiLabelMap.OrderNewDropShipmentForShipGroup} 
[${shipGroup.shipGroupSeqId}]</a>
+                   <a 
href="javascript:document.quickDropShipOrder_${shipGroup_index}.submit();" 
class="buttontext">${uiLabelMap.ProductShipmentQuickComplete}</a>
+                   <a href="javascript:document.createShipment3.submit();" 
class="buttontext">${uiLabelMap.OrderNewDropShipmentForShipGroup} 
[${shipGroup.shipGroupSeqId}]</a>
+                   <form name="quickDropShipOrder_${shipGroup_index}" 
method="post" action="<@ofbizUrl>quickDropShipOrder</@ofbizUrl>">
+                        <input type="hidden" name="orderId" 
value="${orderId}"/>
+                        <input type="hidden" name="shipGroupSeqId" 
value="${shipGroup.shipGroupSeqId}"/>
+                        <input type="hidden" name="externalLoginKey" 
value="${externalLoginKey}">
+                    </form>
+                    <form name="createShipment3" method="post" 
action="/facility/control/createShipment">
+                        <input type="hidden" name="primaryOrderId" 
value="${orderId}"/>
+                        <input type="hidden" name="primaryShipGroupSeqId" 
value="${shipGroup.shipGroupSeqId}"/>
+                        <input type="hidden" name="shipmentTypeId" 
value="DROP_SHIPMENT">
+                        <input type="hidden" name="statusId" 
value="PURCH_SHIP_CREATED">
+                        <input type="hidden" name="externalLoginKey" 
value="${externalLoginKey}">
+                    </form>
                </#if>
              </#if>
             </td>