svn commit: r1337798 - in /ofbiz/branches/release11.04/specialpurpose: ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml myportal/script/org/ofbiz/myportal/Events.xml

[jacopoc]

Author: jacopoc
Date: Sun May 13 08:00:13 2012
New Revision: 1337798

URL: http://svn.apache.org/viewvc?rev=1337798&view=rev
Log:
<script> tag (that I backported as part of the captcha refactoring) doesn't support groovy scriptlets in relesea branch 11.04.

Modified:
    ofbiz/branches/release11.04/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
    ofbiz/branches/release11.04/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml

Modified: ofbiz/branches/release11.04/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=1337798&r1=1337797&r2=1337798&view=diff
==============================================================================
--- ofbiz/branches/release11.04/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original)
+++ ofbiz/branches/release11.04/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Sun May 13 08:00:13 2012
@@ -1279,7 +1279,7 @@ under the License.
             </else>
         </if-empty>
         <call-object-method obj-field="parameters.captcha" method-name="toLowerCase" ret-field="submittedCaptcha"/>
-        <script>groovy: context.actualCaptcha = request.getSession().getAttribute("_CAPTCHA_CODE_")?.toLowerCase()</script>
+        <set field="actualCaptcha" value="${groovy: request.getSession().getAttribute('_CAPTCHA_CODE_')?.toLowerCase()}"/>
         <if-compare-field operator="not-equals" field="submittedCaptcha" to-field="actualCaptcha">
             <add-error><fail-property resource="MyPortalUiLabels" property="MyPortalCaptchaMissingError"/></add-error>
         </if-compare-field>

Modified: ofbiz/branches/release11.04/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml?rev=1337798&r1=1337797&r2=1337798&view=diff
==============================================================================
--- ofbiz/branches/release11.04/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml (original)
+++ ofbiz/branches/release11.04/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml Sun May 13 08:00:13 2012
@@ -47,7 +47,7 @@ under the License.
         <call-object-method obj-field="parameters.PASSWORD" method-name="toLowerCase" ret-field="parameters.PASSWORD"/>
         <call-object-method obj-field="parameters.CONFIRM_PASSWORD" method-name="toLowerCase" ret-field="parameters.CONFIRM_PASSWORD"/>
         <call-object-method obj-field="parameters.captcha" method-name="toLowerCase" ret-field="submittedCaptcha"/>
-        <script>groovy: context.actualCaptcha = request.getSession().getAttribute("_CAPTCHA_CODE_")?.toLowerCase()</script>
+        <set field="actualCaptcha" value="${groovy: request.getSession().getAttribute('_CAPTCHA_CODE_')?.toLowerCase()}"/>
         <if-compare field="parameters.PASSWORD" value="${parameters.CONFIRM_PASSWORD}" operator="equals">
             <if-compare-field operator="equals" field="submittedCaptcha" to-field="actualCaptcha">