Author: hansbak
Date: Mon Aug 20 03:09:19 2007
New Revision: 567634
URL:
http://svn.apache.org/viewvc?rev=567634&view=revLog:
reverted r567553 on davids advice
Modified:
ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/login.ftl
Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=567634&r1=567633&r2=567634&view=diff==============================================================================
--- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original)
+++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Mon Aug 20 03:09:19 2007
@@ -39,7 +39,7 @@
<property-to-field resource="security" property="password.lowercase" default="false" field-name="password_lowercase"/>
<now-timestamp-to-env env-name="nowStamp"/>
- <set field="parameters.roleTypeId" from-field="parameters.ROLETYPEID" default-value="CUSTOMER"/>
+ <set value="CUSTOMER" field="parameters.roleTypeId"/>
<if-compare field-name="allowPassword" operator="not-equals" value="Y">
<set from-field="defaultPassword" field="parameters.PASSWORD"/>
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl?rev=567634&r1=567633&r2=567634&view=diff==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/newcustomer.ftl Mon Aug 20 03:09:19 2007
@@ -86,7 +86,6 @@
<form method="post" action="<@ofbizUrl>createcustomer${previousParams}</@ofbizUrl>" name="newuserform" style="margin: 0;">
<input type="hidden" name="emailProductStoreId" value="${productStoreId}"/>
-<input type="hidden" name="ROLETYPEID" value="${parameters.ROLETYPEID?if_exists}"/>
<div class="screenlet">
<div class="screenlet-header">
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/login.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/login.ftl?rev=567634&r1=567633&r2=567634&view=diff==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/login.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/login.ftl Mon Aug 20 03:09:19 2007
@@ -75,8 +75,6 @@
</div>
<div class="screenlet-body" style="text-align: center;">
<form method="post" action="<@ofbizUrl>newcustomer${previousParams}</@ofbizUrl>" style="margin: 0;">
- <#-- optional field, default is 'CUSTOMER' -->
- <#--input type="hidden" name="ROLETYPEID" value="--enter roletypeId here--"/-->
<div class="tabletext">${uiLabelMap.CommonMayCreateNewAccountHere}:</div>
<div><input type="submit" class="smallSubmit" value="${uiLabelMap.CommonMayCreate}"/></div>
</form>