From fd7c553adf5ce959c496cf4eb3bcdb9f093c4dc5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 31 Aug 2016 10:20:56 +0200 Subject: [PATCH] Please cherry-pick: - fixed confusion between login_user (the actual login process) and user_login (form for users to login) --- .../mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java | 2 +- web/WEB-INF/faces-config.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java index 17cb770b..f92096fd 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 "user_login"; //NOI18N + return "login_user"; //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 6f1454f9..8d8ad92a 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -151,7 +151,7 @@ /guest/user/user_login.xhtml - user_login + login_user /user/login_index.xhtml 1 -- 2.39.5