From: Roland Häder <roland@mxchange.org>
Date: Mon, 29 Aug 2016 13:35:07 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=70156a6a5045a68e4aceac1847f4e86285a9aa47;p=jjobs-war.git

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 20bd3fa0..54b5d8c0 100644
--- 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 3a0c0844..e01217a2 100644
--- 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>