From: Roland Häder Date: Tue, 30 Aug 2016 15:46:53 +0000 (+0200) Subject: Please cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=295f1580926902f7c8cd04ac5e0e567e8c096bf9;p=jjobs-war.git Please cherry-pick: - maybe also other accounts have these "features" ... (not just role "user") Signed-off-by: Roland Häder --- diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebSessionBean.java index b6cd5ee0..141fe14e 100644 --- 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 bf1328c6..38ec33c2 100644 --- 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 b9ed26cc..25eabaf1 100644 --- 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 9b7ab6d1..9ba46bf0 100644 --- 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 a23f60b8..9cc12871 100644 --- 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 38d69470..6f1454f9 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -199,25 +199,25 @@ /guest/user/user_register.xhtml - register_done + user_register_done /guest/user/user_register_done.xhtml - register_page2 + user_register_page2 /guest/user/user_register_page2.xhtml /guest/user/user_register_page2.xhtml - register_done + user_register_done /guest/user/user_register_done.xhtml /user/login_own_addressbooks.xhtml - register_page2 + user_register_page2 /guest/user/user_register_page2.xhtml @@ -225,13 +225,13 @@ /user/login_change_password.xhtml user_data_saved - /user/login/login_data_saved.xhtml + /user/login_data_saved.xhtml /user/login_change_email_address.xhtml - contact_data_saved + user_contact_data_saved /user/login_contact_data_saved.xhtml @@ -242,12 +242,8 @@ /user/login_change_personal_data.xhtml - contact_data_saved - /user/login/login_data_saved.xhtml - - - admin_delete_category - /admin/admin_category_delete.xhtml + user_data_saved + /user/login_data_saved.xhtml