svn commit: r1546783 - /ofbiz/branches/release12.04/framework/common/webcommon/changePassword.ftl

[as...@apache.org]

Author: ashish
Date: Sun Dec  1 07:02:16 2013
New Revision: 1546783

URL: http://svn.apache.org/r1546783
Log:
Applied bug fix from trunk revision - 1546782.
Log Message: Bug fix. Reset password functionality doesn't work in multi-tenant environment as expected. Lets say you have created UserLogin data in any of the tenant and has set UserLogin.requirePasswordChange="Y" then when user try to login into tenant then reset password functionality doesn't work as user expects.

Modified:
    ofbiz/branches/release12.04/framework/common/webcommon/changePassword.ftl

Modified: ofbiz/branches/release12.04/framework/common/webcommon/changePassword.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/common/webcommon/changePassword.ftl?rev=1546783&r1=1546782&r2=1546783&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/common/webcommon/changePassword.ftl (original)
+++ ofbiz/branches/release12.04/framework/common/webcommon/changePassword.ftl Sun Dec  1 07:02:16 2013
@@ -18,6 +18,7 @@ under the License.
 -->
 
 <#assign username = requestParameters.USERNAME?default((sessionAttributes.autoUserLogin.userLoginId)?default(""))>
+<#assign tenantId = requestParameters.tenantId!>
 
 <center>
 <div class="screenlet login-screenlet">
@@ -28,6 +29,7 @@ under the License.
     <form method="post" action="<@o...@ofbizUrl>" name="loginform">
       <input type="hidden" name="requirePasswordChange" value="Y"/>
       <input type="hidden" name="USERNAME" value="${username}"/>
+      <input type="hidden" name="tenantId" value="${tenantId!}"/>
       <table cellspacing="0">
         <tr>
           <td class="label">${uiLabelMap.CommonUsername}</td>