svn commit: r981290 - in /ofbiz/branches/release10.04: ./ mergefromtrunk.bat specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml

Author: jleroux
Date: Sun Aug  1 19:42:53 2010
New Revision: 981290

URL: http://svn.apache.org/viewvc?rev=981290&view=rev
Log:
"Applied fix from trunk for revision: 981288"
------------------------------------------------------------------------
r981288 | jleroux | 2010-08-01 21:36:40 +0200 (dim. 01 ao–t 2010) | 5 lignes

Fix a bug reported by Ruth " eCommerce checkout -> Edit Contact Information -> Save -> Go Back does not return user to checkout" (https://issues.apache.org/jira/browse/OFBIZ-3432) - OFBIZ-3432

Mostly to test the change I just did in mergefromtrunk.bat. Else I'd like to fix also the way the options are shown when using the std checkout (far below, very bad for newcomers). But I have not enough faith, at least today...

I tested enough, and this should not not introduce any side-effects.
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/mergefromtrunk.bat
    ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug  1 19:42:53 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288

Modified: ofbiz/branches/release10.04/mergefromtrunk.bat
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/mergefromtrunk.bat?rev=981290&r1=981289&r2=981290&view=diff
==============================================================================
--- ofbiz/branches/release10.04/mergefromtrunk.bat (original)
+++ ofbiz/branches/release10.04/mergefromtrunk.bat Sun Aug  1 19:42:53 2010
@@ -38,4 +38,19 @@ rem commit the backport to release with
 echo on
 svn merge -r %prevRev%:%version% https://svn.apache.org/repos/asf/ofbiz/trunk
 svn commit -F comment.tmp
-pause
+
+
+:menu
+echo y) tests
+echo n) exit
+choice /c:yn Do you want to run tests ?
+if errorlevel = 2 goto exit
+if errorlevel = 1 goto test
+
+:tests
+ant clean-all
+ant run-install
+ant run-tests
+
+:exit
+echo you can now do the commit by hand

Modified: ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=981290&r1=981289&r2=981290&view=diff
==============================================================================
--- ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release10.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Sun Aug  1 19:42:53 2010
@@ -589,7 +589,7 @@ under the License.
     <request-map uri="checkoutoptions">
       <security https="true" auth="true"/>
       <event type="java" path="org.ofbiz.order.shoppingcart.CheckOutEvents" invoke="setCheckOutPages"/>
-      <response name="shippingaddress" type="view" value="checkoutshippingaddress"/>
+      <response name="shippingaddress" type="view" value="checkoutshippingaddress" save-current-view="true"/>
       <response name="shippingoptions" type="request" value="setOrderCurrencyAgreementShipDates"/>
       <response name="payment" type="request" value="setPoNumber"/>
       <response name="confirm" type="request" value="calcShipping"/>
@@ -995,7 +995,7 @@ under the License.
     </request-map>
 
     <!-- ContactMech Requests -->
-    <request-map uri="editcontactmech"><security https="true" auth="true"/><response name="success" type="view" value="editcontactmech" save-last-view="true"/></request-map>
+    <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>