svn commit: r1744522 - in /ofbiz/branches/release14.12/specialpurpose/webpos: webapp/webpos/ForgotPassword.ftl webapp/webpos/RequirePasswordChange.ftl webapp/webpos/WEB-INF/controller.xml widget/CommonScreens.xml

[pranayp]

Author: pranayp
Date: Thu May 19 06:58:57 2016
New Revision: 1744522

URL: http://svn.apache.org/viewvc?rev=1744522&view=rev
Log:
[OFBIZ-7042] Fix for 14.12 -  "Forgot your password" link in login page is not working for Web POS. On clicking "Forgot your password" link from Web POS login page, system navigating to blank page.

Thanks Amardeep Singh Jhajj for reporting the issue and providing the patch.



Added:
    ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/ForgotPassword.ftl
Modified:
    ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/RequirePasswordChange.ftl
    ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml
    ofbiz/branches/release14.12/specialpurpose/webpos/widget/CommonScreens.xml

Added: ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/ForgotPassword.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/ForgotPassword.ftl?rev=1744522&view=auto
==============================================================================
--- ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/ForgotPassword.ftl (added)
+++ ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/ForgotPassword.ftl Thu May 19 06:58:57 2016
@@ -0,0 +1,43 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<center>
+  <div class="screenlet login-screenlet">
+    <div class="screenlet-title-bar">
+      <h3>${uiLabelMap.CommonForgotYourPassword}?</h3>
+    </div>
+    <div class="screenlet-body">
+      <form method="post" action="<@ofbizUrl>forgotPassword${previousParams!}</@ofbizUrl>" name="forgotpassword">
+        <table class="basic-table" cellspacing="0">
+          <tr>
+            <td class="label">${uiLabelMap.CommonUsername}</td>
+            <td><input type="text" size="20" name="USERNAME" value="<#if requestParameters.USERNAME?has_content>${requestParameters.USERNAME}<#elseif autoUserLogin?has_content>${autoUserLogin.userLoginId}</#if>"/></td>
+          </tr>
+          <tr>
+            <td colspan="2" align="center">
+              <input type="submit" name="GET_PASSWORD_HINT" class="smallSubmit" value="${uiLabelMap.CommonGetPasswordHint}"/>&nbsp;<input type="submit" name="EMAIL_PASSWORD" class="smallSubmit" value="${uiLabelMap.CommonEmailPassword}"/>
+            </td>
+          </tr>
+        </table>
+        <a href='<@ofbizUrl>authview</@ofbizUrl>' class="button">${uiLabelMap.CommonGoBack}</a>
+        <input type="hidden" name="JavaScriptEnabled" value="N"/>
+      </form>
+    </div>
+  </div>
+</center>

Modified: ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/RequirePasswordChange.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/RequirePasswordChange.ftl?rev=1744522&r1=1744521&r2=1744522&view=diff
==============================================================================
--- ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/RequirePasswordChange.ftl (original)
+++ ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/RequirePasswordChange.ftl Thu May 19 06:58:57 2016
@@ -30,6 +30,7 @@ under the License.
     <form method="post" action="<@ofbizUrl>login${previousParams}</@ofbizUrl>" name="loginform">
       <input type="hidden" name="requirePasswordChange" value="Y"/>
       <input type="hidden" name="USERNAME" value="${username}"/>
+      <input type="hidden" name="posTerminalId" value="${parameters.posTerminalId}"/>
       <div>
         ${uiLabelMap.CommonUsername}:&nbsp;${username}
       </div>

Modified: ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml?rev=1744522&r1=1744521&r2=1744522&view=diff
==============================================================================
--- ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release14.12/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml Thu May 19 06:58:57 2016
@@ -461,6 +461,13 @@
         <response name="success" type="request" value="json"/>
         <response name="error" type="request" value="json"/>
     </request-map>
+    
+    <request-map uri="forgotPassword">
+        <security https="true" auth="false"/>
+        <event type="java" path="org.ofbiz.securityext.login.LoginEvents" invoke="forgotPassword"/>
+        <response name="success" type="view" value="ForgotPassword"/>
+        <response name="error" type="view" value="ForgotPassword"/>
+    </request-map>
     <!-- end of Ajax requests -->
     
     <!-- View Mappings -->
@@ -485,5 +492,6 @@
     <view-map name="SearchSalesRepsList" type="screen" page="component://webpos/widget/SearchScreens.xml#SearchSalesRepsList"/>
     <view-map name="SideDeepCategory" type="screen" page="component://webpos/widget/CatalogScreens.xml#SideDeepCategory"/>
     <view-map name="CategoryDetail" type="screen" page="component://webpos/widget/CatalogScreens.xml#CategoryDetail"/>
+    <view-map name="ForgotPassword" type="screen" page="component://webpos/widget/CommonScreens.xml#ForgotPassword"/>
     <!-- End of View Mappings -->
 </site-conf>
\ No newline at end of file

Modified: ofbiz/branches/release14.12/specialpurpose/webpos/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/webpos/widget/CommonScreens.xml?rev=1744522&r1=1744521&r2=1744522&view=diff
==============================================================================
--- ofbiz/branches/release14.12/specialpurpose/webpos/widget/CommonScreens.xml (original)
+++ ofbiz/branches/release14.12/specialpurpose/webpos/widget/CommonScreens.xml Thu May 19 06:58:57 2016
@@ -267,4 +267,17 @@ under the License.
             </widgets>
         </section>
     </screen>
+    <screen name="ForgotPassword">
+        <section>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <platform-specific>
+                            <html><html-template location="component://webpos/webapp/webpos/ForgotPassword.ftl"/></html>
+                        </platform-specific>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
 </screens>