You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2010/09/13 16:56:27 UTC
svn commit: r996564 - in /ofbiz/branches/release10.04: ./
specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
Author: ashish
Date: Mon Sep 13 14:56:27 2010
New Revision: 996564
URL: http://svn.apache.org/viewvc?rev=996564&view=rev
Log:
Applied fix from trunk for revision: 996563
===
When I enter values in "New Password" and "Verify Password" fields without entering value in "Current Password" field then system is accepting new password without any error.
Correct flow should be : System should ask user to enter "Current Password".
Modified:
ofbiz/branches/release10.04/ (props changed)
ofbiz/branches/release10.04/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 13 14:56:27 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,940851,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,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985473,985718,985856,985902,987841,989166,990127,990339,990539,991
485,993344,993387,995384,995686,996069,996078-996079
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,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,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985473,985718,985856,985902,987841,989166,990127,990339,990539,991
485,993344,993387,995384,995686,996069,996078-996079,996563
Modified: ofbiz/branches/release10.04/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=996564&r1=996563&r2=996564&view=diff
==============================================================================
--- ofbiz/branches/release10.04/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original)
+++ ofbiz/branches/release10.04/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Mon Sep 13 14:56:27 2010
@@ -913,21 +913,30 @@ under the License.
</call-bsh>
<set field="parameters.userLogin" from-field="userLogin"/>
<else>
- <if-not-empty field="parameters.currentPassword">
- <call-map-processor xml-resource="component://securityext/script/org/ofbiz/securityext/login/LoginMapProcs.xml"
- processor-name="updatePassword" in-map-name="parameters" out-map-name="passwordMap"/>
- <check-errors/>
- <set-service-fields service-name="updatePassword" map="passwordMap" to-map="passwordCtx"/>
- <call-service service-name="updatePassword" in-map-name="passwordCtx">
- <result-to-field result-name="updatedUserLogin"/>
- </call-service>
- <set-current-user-login value-field="updatedUserLogin"/>
- <session-to-field field="userLogin"/>
- <if-compare field="userLogin.userLoginId" operator="equals" value="${updatedUserLogin.userLoginId}">
- <field-to-session field="updatedUserLogin" session-name="userLogin"/>
- </if-compare>
- <session-to-field field="userLogin"/>
- </if-not-empty>
+ <if>
+ <condition>
+ <or>
+ <not><if-empty field="parameters.currentPassword"></if-empty></not>
+ <not><if-empty field="parameters.newPassword"></if-empty></not>
+ <not><if-empty field="parameters.newPasswordVerify"> </if-empty></not>
+ </or>
+ </condition>
+ <then>
+ <call-map-processor xml-resource="component://securityext/script/org/ofbiz/securityext/login/LoginMapProcs.xml"
+ processor-name="updatePassword" in-map-name="parameters" out-map-name="passwordMap"/>
+ <check-errors/>
+ <set-service-fields service-name="updatePassword" map="passwordMap" to-map="passwordCtx"/>
+ <call-service service-name="updatePassword" in-map-name="passwordCtx">
+ <result-to-field result-name="updatedUserLogin"/>
+ </call-service>
+ <set-current-user-login value-field="updatedUserLogin"/>
+ <session-to-field field="userLogin"/>
+ <if-compare field="userLogin.userLoginId" operator="equals" value="${updatedUserLogin.userLoginId}">
+ <field-to-session field="updatedUserLogin" session-name="userLogin"/>
+ </if-compare>
+ <session-to-field field="userLogin"/>
+ </then>
+ </if>
</else>
</if-empty>
</simple-method>