svn commit: r1327260 - in /ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce: WEB-INF/controller.xml customer/editcontactmech.ftl

Author: jleroux
Date: Tue Apr 17 20:03:10 2012
New Revision: 1327260

URL: http://svn.apache.org/viewvc?rev=1327260&view=rev
Log:
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/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=1327260&r1=1327259&r2=1327260&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Tue Apr 17 20:03:10 2012
@@ -1011,7 +1011,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/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl?rev=1327260&r1=1327259&r2=1327260&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl Tue Apr 17 20:03:10 2012
@@ -18,7 +18,7 @@ under the License.
 -->
 <#if canNotView>
   <h3>${uiLabelMap.PartyContactInfoNotBelongToYou}.</h3>
-  <a href="<@ofbizUrl>editcontactmechdone</@ofbizUrl>" class="button">${uiLabelMap.CommonBack}</a>
+  <a href="<@ofbizUrl>${donePage}</@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='<@ofbizUrl>editcontactmechdone</@ofbizUrl>' class="button">${uiLabelMap.CommonGoBack}</a>
+      <a href='<@ofbizUrl>${donePage}</@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='<@ofbizUrl>${reqName}</@ofbizUrl>' name="editcontactmechform" id="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="<@ofbizUrl>editcontactmechdone</@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a>
+      <a href="<@ofbizUrl>${donePage}</@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>
@@ -241,9 +241,9 @@ under the License.
     </form>
   </table>
 
-  <a href="<@ofbizUrl>editcontactmechdone</@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a>
+  <a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a>
   <a href="javascript:document.editcontactmechform.submit()" class="button">${uiLabelMap.CommonSave}</a>
   <#else>    
-    <a href="<@ofbizUrl>editcontactmechdone</@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a>
+    <a href="<@ofbizUrl>${donePage}</@ofbizUrl>" class="button">${uiLabelMap.CommonGoBack}</a>
   </#if>
 </#if>
\ No newline at end of file