You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/05/11 22:02:02 UTC
svn commit: r773670 - in /ofbiz/branches/release09.04: ./
specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl
Author: jleroux
Date: Mon May 11 20:02:02 2009
New Revision: 773670
URL: http://svn.apache.org/viewvc?rev=773670&view=rev
Log:
"Applied fix from trunk for revision: 773659"
------------------------------------------------------------------------
r773659 | jleroux | 2009-05-11 21:11:37 +0200 (lun., 11 mai 2009) | 5 lines
This fix 2 issues related to non secured URLs with
a modified patch from Chandan Khandelwal "Create Request from shopping list in eCommerce" (https://issues.apache.org/jira/browse/OFBIZ-2423) - OFBIZ-2423
a modified patch from Rohit Jain "Create Quote from shopping list in eCommerce" (https://issues.apache.org/jira/browse/OFBIZ-2424) - OFBIZ-2424
But, in spite of my (small) efforts, it has also introduced a small UI issue. Now the related links are not well shown. I have opened https://issues.apache.org/jira/browse/OFBIZ-2460 for that. I committed because I think it's better to have something which works even if the UI is not good.
------------------------------------------------------------------------
Modified:
ofbiz/branches/release09.04/ (props changed)
ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl
Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 11 20:02:02 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
+/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
Modified: ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl?rev=773670&r1=773669&r2=773670&view=diff
==============================================================================
--- ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl (original)
+++ ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl Mon May 11 20:02:02 2009
@@ -64,9 +64,15 @@
<div class="screenlet">
<div class="screenlet-header">
<div class="boxlink">
- <a href="<@o...@ofbizUrl>" class="submenutext">${uiLabelMap.OrderCreateCustRequestFromShoppingList}</a>
- <a href="<@o...@ofbizUrl>" class="submenutext">${uiLabelMap.OrderCreateQuoteFromShoppingList}</a>
- <a href="javascript:document.updateList.submit();" class="submenutextright">${uiLabelMap.CommonSave}</a>
+ <form name= "createCustRequestFromShoppingList" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "shoppingListId" value= "${shoppingList.shoppingListId}"/>
+ <a href='javascript:document.createCustRequestFromShoppingList.submit()'><div class='submenutext'>${uiLabelMap.OrderCreateCustRequestFromShoppingList}</div></a>
+ </form>
+ <form name="createQuoteFromShoppingList" method="post" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="shoppingListId" value="${shoppingList.shoppingListId}"/>
+ <a href='javascript:document.createQuoteFromShoppingList.submit()'><div class='submenutext'>${uiLabelMap.OrderCreateQuoteFromShoppingList}</div></a>
+ </form>
+ <a href="javascript:document.updateList.submit();" class="submenutextright">${uiLabelMap.CommonSave}</a>
</div>
<div class="boxhead"> ${uiLabelMap.EcommerceShoppingListDetail} - ${shoppingList.listName}</div>
</div>