Author: jleroux
Date: Fri Sep 4 08:38:57 2009 New Revision: 811282 URL: http://svn.apache.org/viewvc?rev=811282&view=rev Log: "Applied fix from trunk for revision: 811280" ------------------------------------------------------------------------ r811280 | jleroux | 2009-09-04 10:35:41 +0200 (ven., 04 sept. 2009) | 2 lines A patch from Ahmed Dini "non-secure (https) request error [searchorders] (searchOtherOrders)" (https://issues.apache.org/jira/browse/OFBIZ-2787) - OFBIZ-2787 ------------------------------------------------------------------------ Modified: ofbiz/branches/release09.04/ (props changed) ofbiz/branches/release09.04/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl Propchange: ofbiz/branches/release09.04/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 4 08:38:57 2009 @@ -1 +1 @@ -/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810832,810 836,810878,810917,810921,811020 +/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810832,810 836,810878,810917,810921,811020,811280 Modified: ofbiz/branches/release09.04/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl?rev=811282&r1=811281&r2=811282&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl (original) +++ ofbiz/branches/release09.04/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl Fri Sep 4 08:38:57 2009 @@ -56,8 +56,15 @@ <#if orderHeader.salesChannelEnumId != "POS_SALES_CHANNEL"> <div> <a href="<@ofbizUrl>/orderentry?partyId=${partyId}&orderTypeId=${orderHeader.orderTypeId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNewOrder}</a> - <a href="<@ofbizUrl>/searchorders?lookupFlag=Y&hideFields=Y&partyId=${partyId}&viewIndex=1&viewSize=20</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderOtherOrders}</a> + <a href="javascript:document.searchOtherOrders.submit()" class="buttontext">${uiLabelMap.OrderOtherOrders}</a> </div> + <form name="searchOtherOrders" method="post" action="<@ofbizUrl>searchorders</@ofbizUrl>"> + <input type="hidden" name="lookupFlag" value="Y"/> + <input type="hidden" name="hideFields" value="Y"/> + <input type="hidden" name="partyId" value="${partyId}"> + <input type="hidden" name="viewIndex" value="1"/> + <input type="hidden" name="viewSize" value="20"/> + </form> </#if> </#if> </div> |
Free forum by Nabble | Edit this page |