Author: ashish
Date: Wed Jul 22 17:46:47 2009
New Revision: 796810
URL:
http://svn.apache.org/viewvc?rev=796810&view=revLog:
Applied patch from jira issue OFBIZ-2750 - Secure Url in ordershippinginfo.ftl.
Thanks Pranay for the contribution.
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
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=796810&r1=796809&r2=796810&view=diff==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Wed Jul 22 17:46:47 2009
@@ -624,8 +624,20 @@
</form>
</div>
<#else>
- <a href="<@ofbizUrl>quickDropShipOrder?orderId=${orderId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}&externalLoginKey=${externalLoginKey}</@ofbizUrl>" class="buttontext" target="_blank">${uiLabelMap.ProductShipmentQuickComplete}</a>
- <a href="/facility/control/createShipment?primaryOrderId=${orderId}&primaryShipGroupSeqId=${shipGroup.shipGroupSeqId}&shipmentTypeId=DROP_SHIPMENT&statusId=PURCH_SHIP_CREATED&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>