Please cherry-pick:

- renamed navigation case "login" -> "user_login" as also other logins may exist
- added navigation rule user_index -> user_change_password

Signed-off-by: Roland Häder <roland@haeder.net>

diff --git a/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java
index 20bd3fa08826a5bfa9c5ab0207bfd6f1d15b005b..54b5d8c04fe12bda45cf864847788e1c2678ddd7 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java
+++ b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java
@@ -228,7 +228,7 @@ public class JobsUserLoginWebSessionBean extends BaseJobsController implements J
                        this.clear();
 
                        // All fine
-                       return "login"; //NOI18N
+                       return "user_login"; //NOI18N
                } catch (final UserNotFoundException ex) {
                        // Show JSF message
                        this.showFacesMessage("form_user_login:userName", "ERROR_USER_NOT_FOUND"); //NOI18N

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 3a0c08443ed8e7a7f82872eeed9fa3ed12c266e8..e01217a23aedf3860ef0aa50b64c1237c70346b8 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -133,10 +133,17 @@
                        <to-view-id>/admin/mobile/admin_contact_mobile_list.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/user/login_index.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>user_change_password</from-outcome>
+                       <to-view-id>/user/login_change_password</to-view-id>
+               </navigation-case>
+       </navigation-rule>
        <navigation-rule>
                <from-view-id>/guest/user/login.xhtml</from-view-id>
                <navigation-case>
-                       <from-outcome>login</from-outcome>
+                       <from-outcome>user_login</from-outcome>
                        <to-view-id>/user/login_index.xhtml</to-view-id>
                        <redirect>1</redirect>
                </navigation-case>