Author: jleroux
Date: Tue Apr 21 13:04:56 2009
New Revision: 767140
URL: http://svn.apache.org/viewvc?rev=767140&view=rev
Log:
Applied fix from trunk for revision: 767127
Modified:
ofbiz/branches/release09.04/ (props changed)
ofbiz/branches/release09.04/applications/order/webapp/ordermgr/WEB-INF/controller.xml
ofbiz/branches/release09.04/applications/product/webapp/catalog/product/EditProductFeatures.ftl
ofbiz/branches/release09.04/framework/common/webcommon/WEB-INF/portal-controller.xml
Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 21 13:04:56 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127
Modified:
ofbiz/branches/release09.04/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=767140&r1=767139&r2=767140&view=diff
==============================================================================
---
ofbiz/branches/release09.04/applications/order/webapp/ordermgr/WEB-INF/controller.xml
(original)
+++
ofbiz/branches/release09.04/applications/order/webapp/ordermgr/WEB-INF/controller.xml
Tue Apr 21 13:04:56 2009
@@ -669,7 +669,7 @@
</request-map>
<request-map uri="createCreditCard">
<security https="true" auth="true"/>
- <event type="simple"
path="org/ofbiz/accounting/payment/PaymentMethodEvents.xml"
invoke="createCreditCard"/>
+ <event type="simple"
path="component://accounting/script/org/ofbiz/accounting/payment/PaymentMethodEvents.xml"
invoke="createCreditCard"/>
<response name="success" type="view" value="editcreditcard"/>
<response name="address" type="view" value="editcontactmech"/>
<response name="error" type="view" value="editcreditcard"/>
@@ -727,7 +727,7 @@
</request-map>
<request-map uri="createCustomer">
<security https="true" auth="true"/>
- <event type="simple"
path="org/ofbiz/order/customer/CustomerEvents.xml" invoke="createCustomer"/>
+ <event type="simple"
path="component://order/script/org/ofbiz/order/customer/CustomerEvents.xml"
invoke="createCustomer"/>
<response name="success" type="request" value="finalizeOrder"/>
<response name="error" type="view" value="custsetting"/>
</request-map>
@@ -789,7 +789,7 @@
</request-map>
<request-map uri="updateCreditCard">
<security https="true" auth="true"/>
- <event type="simple"
path="org/ofbiz/accounting/payment/PaymentMethodEvents.xml"
invoke="updateCreditCard"/>
+ <event type="simple"
path="component://accounting/script/org/ofbiz/accounting/payment/PaymentMethodEvents.xml"
invoke="updateCreditCard"/>
<response name="success" type="view" value="editcreditcard"/>
<response name="address" type="view" value="editcreditcard"/>
<response name="error" type="view" value="editcreditcard"/>
@@ -1114,7 +1114,7 @@
<request-map uri="createCustRequestContent">
<security auth="true" https="true"/>
- <event path="org/ofbiz/order/request/CustRequestEvents.xml"
type="simple" invoke="createCustRequestContent"/>
+ <event
path="component://order/script/org/ofbiz/order/request/CustRequestEvents.xml"
type="simple" invoke="createCustRequestContent"/>
<response name="success" type="request-redirect"
value="EditCustRequestContent"><redirect-parameter
name="custRequestId"/></response>
<response name="error" type="view" value="EditCustRequestContent"/>
</request-map>
Modified:
ofbiz/branches/release09.04/applications/product/webapp/catalog/product/EditProductFeatures.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/webapp/catalog/product/EditProductFeatures.ftl?rev=767140&r1=767139&r2=767140&view=diff
==============================================================================
---
ofbiz/branches/release09.04/applications/product/webapp/catalog/product/EditProductFeatures.ftl
(original)
+++
ofbiz/branches/release09.04/applications/product/webapp/catalog/product/EditProductFeatures.ftl
Tue Apr 21 13:04:56 2009
@@ -47,7 +47,7 @@
<input type="hidden" name="productFeatureId_o_${rowCount}"
value="${(productFeatureAndAppl.productFeatureId)?if_exists}">
<input type="hidden" name="fromDate_o_${rowCount}"
value="${(productFeatureAndAppl.fromDate)?if_exists}">
<td><a
href="<@ofbizUrl>EditFeature?productFeatureId=${(productFeatureAndAppl.productFeatureId)?if_exists}</@ofbizUrl>"
class="buttontext">
-
${(productFeatureAndAppl.productFeatureId)?if_exists}</a></td>
+
${(productFeatureAndAppl.productFeatureId)?if_exists}</a></td>
<td>${(productFeatureAndAppl.get("description",locale))?if_exists}</td>
<td>${(curProductFeatureType.get("description",locale))?default((productFeatureAndAppl.productFeatureTypeId)?if_exists)}</td>
<td><a
href="<@ofbizUrl>EditFeatureCategoryFeatures?productFeatureCategoryId=${(productFeatureAndAppl.productFeatureCategoryId)?if_exists}&productId=${(productFeatureAndAppl.productId)?if_exists}</@ofbizUrl>"
class="buttontext">
@@ -77,7 +77,12 @@
<input type="checkbox" name="_rowSubmit_o_${rowCount}"
value="Y" onclick="javascript:checkToggle(this,
'selectAllForm');highlightRow(this,'productFeatureId_tableRow_${rowCount}');">
</td>
<td>
- <a
href='<@ofbizUrl>RemoveFeatureFromProduct?productId=${(productFeatureAndAppl.productId)?if_exists}&productFeatureId=${(productFeatureAndAppl.productFeatureId)?if_exists}&fromDate=${productFeatureAndAppl.getString("fromDate")}</@ofbizUrl>'
class="buttontext">${uiLabelMap.CommonDelete}</a>
+ <form name= "RemoveFeatureFromProduct_o_${rowCount}"
method= "post" action= "<@ofbizUrl>RemoveFeatureFromProduct</@ofbizUrl>">
+ <input type= "hidden" name= "productId" value=
"${(productFeatureAndAppl.productId)?if_exists}">
+ <input type= "hidden" name= "productFeatureId" value=
"${(productFeatureAndAppl.productFeatureId)?if_exists}">
+ <input type= "hidden" name= "fromDate" value=
"${productFeatureAndAppl.getString("fromDate")}">
+ <a
href="javascript:document.RemoveFeatureFromProduct_o_${rowCount}.submit()"
class="buttontext">${uiLabelMap.CommonDelete}</a>
+ </form>
</td>
</tr>
<#assign rowCount = rowCount + 1>
Modified:
ofbiz/branches/release09.04/framework/common/webcommon/WEB-INF/portal-controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/common/webcommon/WEB-INF/portal-controller.xml?rev=767140&r1=767139&r2=767140&view=diff
==============================================================================
---
ofbiz/branches/release09.04/framework/common/webcommon/WEB-INF/portal-controller.xml
(original)
+++
ofbiz/branches/release09.04/framework/common/webcommon/WEB-INF/portal-controller.xml
Tue Apr 21 13:04:56 2009
@@ -30,7 +30,7 @@
</request-map>
<request-map uri="ManagePortalPages">
<security https="true" auth="true"/>
- <event type="simple" invoke="copyIfRequiredSystemPage"
path="org/ofbiz/common/PortalPageMethods.xml"/>
+ <event type="simple" invoke="copyIfRequiredSystemPage"
path="component://common/script/org/ofbiz/common/PortalPageMethods.xml"/>
<response name="success" type="view" value="ManagePortalPages"/>
</request-map>
<request-map uri="AddPortlet">
@@ -91,7 +91,7 @@
</request-map>
<request-map uri="setPortalPortletAttributes">
<security https="true" auth="true"/>
- <event type="simple" invoke="setPortalPortletAttributes"
path="org/ofbiz/common/PortalPageMethods.xml"/>
+ <event type="simple" invoke="setPortalPortletAttributes"
path="component://common/script/org/ofbiz/common/PortalPageMethods.xml"/>
<response name="success" type="request" value="ManagePortalPages"/>
<response name="error" type="request" value="ManagePortalPages"/>
</request-map>
