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 2012/04/17 22:06:20 UTC
svn commit: r1327264 - in /ofbiz/branches/release11.04: ./
specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl
Author: jleroux
Date: Tue Apr 17 20:06:19 2012
New Revision: 1327264
URL: http://svn.apache.org/viewvc?rev=1327264&view=rev
Log:
"Applied fix from trunk for revision: 1327260"
------------------------------------------------------------------------
r1327260 | jleroux | 2012-04-17 22:03:10 +0200 (mar., 17 avr. 2012) | 10 lines
A patch from Tom Burns for "eCommerce Profile Back Button Fail" https://issues.apache.org/jira/browse/OFBIZ-4814
. Some navigation buttons reached from the eCommerce Profile screen fail to return to the Profile screen.
Example:
Login as DemoCustomer
Click Profile
Click Update In the "Contact Information" > "Postal Address" section.
Click Go Back
Expected: Return to profile page
Actual: Remain on Edit Contact Information page
------------------------------------------------------------------------
Modified:
ofbiz/branches/release11.04/ (props changed)
ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl
Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1327260
Modified: ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=1327264&r1=1327263&r2=1327264&view=diff
==============================================================================
--- ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Tue Apr 17 20:06:19 2012
@@ -1009,7 +1009,6 @@ under the License.
<!-- ContactMech Requests -->
<request-map uri="editcontactmech"><security https="true" auth="true"/><response name="success" type="view" value="editcontactmech"/></request-map>
<request-map uri="editcontactmechnosave"><security https="true" auth="true"/><response name="success" type="view" value="editcontactmech"/></request-map>
- <request-map uri="editcontactmechdone"><security https="true" auth="true"/><response name="success" type="view-last" value="editcontactmech"/></request-map>
<request-map uri="createContactMech">
<security https="true" auth="true"/>
Modified: ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl?rev=1327264&r1=1327263&r2=1327264&view=diff
==============================================================================
--- ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl (original)
+++ ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl Tue Apr 17 20:06:19 2012
@@ -18,7 +18,7 @@ under the License.
-->
<#if canNotView>
<h3>${uiLabelMap.PartyContactInfoNotBelongToYou}.</h3>
- <a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonBack}</a>
+ <a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonBack}</a>
<#else>
<#if !contactMech?exists>
<#-- When creating a new contact mech, first select the type, then actually create -->
@@ -47,7 +47,7 @@ under the License.
<#if contactMechTypeId?exists>
<#if !contactMech?exists>
<h2>${uiLabelMap.PartyCreateNewContactInfo}</h2>
- <a href='<@o...@ofbizUrl>' class="button">${uiLabelMap.CommonGoBack}</a>
+ <a href='<@o...@ofbizUrl>' class="button">${uiLabelMap.CommonGoBack}</a>
<a href="javascript:document.editcontactmechform.submit()" class="button">${uiLabelMap.CommonSave}</a>
<table width="90%" border="0" cellpadding="2" cellspacing="0">
<form method="post" action='<@o...@ofbizUrl>' name="editcontactmechform">
@@ -61,7 +61,7 @@ under the License.
<#if paymentMethodId?has_content><input type='hidden' name='paymentMethodId' value='${paymentMethodId}' /></#if>
<#else>
<h2>${uiLabelMap.PartyEditContactInfo}</h2>
- <a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a>
+ <a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a>
<a href="javascript:document.editcontactmechform.submit()" class="button">${uiLabelMap.CommonSave}</a>
<table width="90%" border="0" cellpadding="2" cellspacing="0">
<tr>
@@ -236,9 +236,9 @@ under the License.
</form>
</table>
- <a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a>
+ <a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a>
<a href="javascript:document.editcontactmechform.submit()" class="button">${uiLabelMap.CommonSave}</a>
<#else>
- <a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a>
+ <a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a>
</#if>
</#if>
\ No newline at end of file