Please cherry-pick:

- maybe also other accounts have these "features" ... (not just role "user")

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionBean.java
index b6cd5ee002f9d6e40d226e05c950f466a30894be..141fe14e7feb9257cebb50bffb0fbf9ce1c57490 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionBean.java
+++ b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionBean.java
@@ -676,7 +676,7 @@ public class JobsContactWebSessionBean extends BaseJobsController implements Job
                this.contactBean.updateContactData(contact, this.isMobileUnlinked, this.isLandLineUnlinked, this.isFaxUnlinked);
 
                // All fine
-               return "contact_data_saved"; //NOI18N
+               return "user_contact_data_saved"; //NOI18N
        }
 
        @Override

diff --git a/src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionBean.java
index bf1328c6990d6294e40ca04c2978f7fcdf54de36..38ec33c2b6066839bc4979a9c647529d88ba8566 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionBean.java
+++ b/src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionBean.java
@@ -157,7 +157,7 @@ public class JobsEmailChangeWebSessionBean extends BaseJobsController implements
                this.clear();
 
                // All fine
-               return "login_email_change_queued"; //NOI18N
+               return "user_login_email_change_queued"; //NOI18N
        }
 
        @Override

diff --git a/src/java/org/mxchange/jjobs/beans/register/JobsUserRegisterWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/register/JobsUserRegisterWebSessionBean.java
index b9ed26cc779ef22d292961a460dc3545f03c770a..25eabaf1b9556c9125fa9e025b10cc90522c29af 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/register/JobsUserRegisterWebSessionBean.java
+++ b/src/java/org/mxchange/jjobs/beans/register/JobsUserRegisterWebSessionBean.java
@@ -203,7 +203,7 @@ public class JobsUserRegisterWebSessionBean extends BaseJobsController implement
                        this.registeredEvent.fire(new RegisteredUserEvent(registeredUser));
 
                        // All fine, redirect to proper page
-                       return "register_done"; //NOI18N
+                       return "user_register_done"; //NOI18N
                } catch (final UserNameAlreadyRegisteredException | EmailAddressAlreadyRegisteredException ex) {
                        // Continue to throw
                        throw new FaceletException(ex);
@@ -255,7 +255,7 @@ public class JobsUserRegisterWebSessionBean extends BaseJobsController implement
                }
 
                // Now only redirect to next page as the JSF does it
-               return "register_page2"; //NOI18N
+               return "user_register_page2"; //NOI18N
        }
 
 }

diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java
index 9b7ab6d14ec5218ce2d3a959247de5bcad0c73e2..9ba46bf007d6e63f133b994c6e375728d97b70ad 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java
+++ b/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java
@@ -567,7 +567,7 @@ public class JobsUserWebSessionBean extends BaseJobsController implements JobsUs
                this.updatedPersonalDataEvent.fire(new UserUpdatedPersonalDataEvent(updatedUser));
 
                // All fine
-               return "contact_data_saved"; //NOI18N
+               return "user_contact_data_saved"; //NOI18N
        }
 
        @Override

diff --git a/src/java/org/mxchange/jjobs/beans/user/password/JobsUserPasswordWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/password/JobsUserPasswordWebRequestBean.java
index a23f60b8cf4a0ed534c527fc614ce5150ab3b070..9cc1287194386b6bfbb0a2d86c1e2461daf62170 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/user/password/JobsUserPasswordWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/user/password/JobsUserPasswordWebRequestBean.java
@@ -191,7 +191,7 @@ public class JobsUserPasswordWebRequestBean extends BaseJobsController implement
                this.clear();
 
                // Return outcome
-               return "login_data_saved"; //NOI18N
+               return "user_data_saved"; //NOI18N
        }
 
        @Override

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 38d694706081226acece39b5f5bbaf972be63ecd..6f1454f96ce5bdee3db3a09d3a84925bdd7c588d 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -199,25 +199,25 @@
        <navigation-rule>
                <from-view-id>/guest/user/user_register.xhtml</from-view-id>
                <navigation-case>
-                       <from-outcome>register_done</from-outcome>
+                       <from-outcome>user_register_done</from-outcome>
                        <to-view-id>/guest/user/user_register_done.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>register_page2</from-outcome>
+                       <from-outcome>user_register_page2</from-outcome>
                        <to-view-id>/guest/user/user_register_page2.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
                <from-view-id>/guest/user/user_register_page2.xhtml</from-view-id>
                <navigation-case>
-                       <from-outcome>register_done</from-outcome>
+                       <from-outcome>user_register_done</from-outcome>
                        <to-view-id>/guest/user/user_register_done.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
                <from-view-id>/user/login_own_addressbooks.xhtml</from-view-id>
                <navigation-case>
-                       <from-outcome>register_page2</from-outcome>
+                       <from-outcome>user_register_page2</from-outcome>
                        <to-view-id>/guest/user/user_register_page2.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
@@ -225,13 +225,13 @@
                <from-view-id>/user/login_change_password.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>user_data_saved</from-outcome>
-                       <to-view-id>/user/login/login_data_saved.xhtml</to-view-id>
+                       <to-view-id>/user/login_data_saved.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
                <from-view-id>/user/login_change_email_address.xhtml</from-view-id>
                <navigation-case>
-                       <from-outcome>contact_data_saved</from-outcome>
+                       <from-outcome>user_contact_data_saved</from-outcome>
                        <to-view-id>/user/login_contact_data_saved.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
@@ -242,12 +242,8 @@
        <navigation-rule>
                <from-view-id>/user/login_change_personal_data.xhtml</from-view-id>
                <navigation-case>
-                       <from-outcome>contact_data_saved</from-outcome>
-                       <to-view-id>/user/login/login_data_saved.xhtml</to-view-id>
-               </navigation-case>
-               <navigation-case>
-                       <from-outcome>admin_delete_category</from-outcome>
-                       <to-view-id>/admin/admin_category_delete.xhtml</to-view-id>
+                       <from-outcome>user_data_saved</from-outcome>
+                       <to-view-id>/user/login_data_saved.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>