Please cherry-pick:

- fixed confusion between login_user (the actual login process) and user_login (form for users to login)

diff --git a/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java
index 17cb770bea774801e1995736447336095e9b49ae..f92096fd7fc22a69726abce4bdfeacc7cae2875f 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 "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 6f1454f96ce5bdee3db3a09d3a84925bdd7c588d..8d8ad92a3ba2f95ac1c8beae1cf4bcf3dd4b6f2a 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -151,7 +151,7 @@
        <navigation-rule>
                <from-view-id>/guest/user/user_login.xhtml</from-view-id>
                <navigation-case>
-                       <from-outcome>user_login</from-outcome>
+                       <from-outcome>login_user</from-outcome>
                        <to-view-id>/user/login_index.xhtml</to-view-id>
                        <redirect>1</redirect>
                </navigation-case>