From b1e64ac333677da1c90b4f3587e3b23950c4183e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 17 Jul 2017 17:23:56 +0200 Subject: [PATCH] Please cherry-pick: - renamed feature 'user_name_required' to 'user_login_requires_user_name' to make it more clear MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../mxchange/jjobs/beans/user/JobsUserWebSessionBean.java | 2 +- .../beans/user/register/JobsUserRegisterWebSessionBean.java | 4 ++-- web/WEB-INF/templates/admin/user/admin_show_user_data.tpl | 2 +- .../templates/admin/user/admin_show_user_data_mini.tpl | 2 +- web/WEB-INF/templates/guest/guest_menu.tpl | 4 ++-- web/WEB-INF/templates/guest/user/guest_login_form.tpl | 4 ++-- .../guest/user/register/guest_form_register_page1.tpl | 4 ++-- .../guest/user/register/guest_form_register_single.tpl | 4 ++-- web/WEB-INF/web.xml | 6 +++--- web/admin/user/admin_user_activity_log.xhtml | 2 +- web/admin/user/admin_user_export.xhtml | 2 +- web/admin/user/admin_user_list.xhtml | 2 +- web/guest/user/user_login.xhtml | 6 +++--- web/guest/user/user_lost_password.xhtml | 4 ++-- web/guest/user/user_register.xhtml | 2 +- web/guest/user/user_register_page2.xhtml | 2 +- 16 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java index 751a7420..13bfc286 100644 --- a/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java @@ -804,7 +804,7 @@ public class JobsUserWebSessionBean extends BaseJobsController implements JobsUs @Override public boolean isUserNameRequired () { // Get context parameter - String contextParameter = FacesContext.getCurrentInstance().getExternalContext().getInitParameter("is_user_name_required"); //NOI18N + String contextParameter = FacesContext.getCurrentInstance().getExternalContext().getInitParameter("is_user_login_require_user_name"); //NOI18N // Is it set? boolean isRequired = ((contextParameter instanceof String) && (contextParameter.toLowerCase().equals("true"))); //NOI18N diff --git a/src/java/org/mxchange/jjobs/beans/user/register/JobsUserRegisterWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/user/register/JobsUserRegisterWebSessionBean.java index cd475e7d..daf3dbf0 100644 --- a/src/java/org/mxchange/jjobs/beans/user/register/JobsUserRegisterWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/register/JobsUserRegisterWebSessionBean.java @@ -124,7 +124,7 @@ public class JobsUserRegisterWebSessionBean extends BaseJobsController implement } else if (!this.userController.isRequiredPersonalDataSet()) { // Not all required fields are set throw new FaceletException("Not all required fields are set."); //NOI18N - } else if ((this.featureController.isFeatureEnabled("user_name_required")) && (this.userController.isUserNameRegistered(user))) { //NOI18N + } else if ((this.featureController.isFeatureEnabled("user_login_require_user_name")) && (this.userController.isUserNameRegistered(user))) { //NOI18N // Is multi-page enabled? if (this.featureController.isFeatureEnabled("user_register_multiple_page")) { //NOI18N // User name is already used, should not happen here @@ -231,7 +231,7 @@ public class JobsUserRegisterWebSessionBean extends BaseJobsController implement if (null == user) { // user must be set throw new NullPointerException("user is null after createUserInstance() was called"); //NOI18N - } else if ((this.featureController.isFeatureEnabled("user_name_required")) && (this.userController.isUserNameRegistered(user))) { //NOI18N + } else if ((this.featureController.isFeatureEnabled("user_login_require_user_name")) && (this.userController.isUserNameRegistered(user))) { //NOI18N // User name is already used, so clear it this.userController.setUserName(null); this.showFacesMessage("form_register_page1:userName", "ERROR_USER_NAME_ALREADY_USED"); //NOI18N diff --git a/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl index 52f1cc58..53c83f28 100644 --- a/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl +++ b/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl @@ -19,7 +19,7 @@ - + diff --git a/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl b/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl index 42e57557..c3a137cd 100644 --- a/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl +++ b/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl @@ -23,7 +23,7 @@ - + diff --git a/web/WEB-INF/templates/guest/guest_menu.tpl b/web/WEB-INF/templates/guest/guest_menu.tpl index 1bc058f8..778b4946 100644 --- a/web/WEB-INF/templates/guest/guest_menu.tpl +++ b/web/WEB-INF/templates/guest/guest_menu.tpl @@ -22,7 +22,7 @@
    - +
    • @@ -34,7 +34,7 @@     - +
    • diff --git a/web/WEB-INF/templates/guest/user/guest_login_form.tpl b/web/WEB-INF/templates/guest/user/guest_login_form.tpl index cc8edcf3..74f86eeb 100644 --- a/web/WEB-INF/templates/guest/user/guest_login_form.tpl +++ b/web/WEB-INF/templates/guest/user/guest_login_form.tpl @@ -5,7 +5,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
    - +
    @@ -56,7 +56,7 @@ - +
    diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl index 97af2dba..e7f92540 100644 --- a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl +++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl @@ -17,7 +17,7 @@ - +
    @@ -37,7 +37,7 @@ - +
    diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl index 7fb7d9c8..98f822df 100644 --- a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl +++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl @@ -19,7 +19,7 @@ - +
    @@ -39,7 +39,7 @@ - +
    diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml index a55250bd..5c57de59 100644 --- a/web/WEB-INF/web.xml +++ b/web/WEB-INF/web.xml @@ -19,7 +19,7 @@ Whether a user name is required for this application. - is_feature_user_name_required_enabled + is_feature_user_login_require_user_name_enabled true @@ -113,13 +113,13 @@ false - Whether the public user profile is enabled. If this option is enabled, the setting "is_user_name_required" must also be enabled as it is mandadory. + Whether the public user profile is enabled. If this option is enabled, the setting "is_user_login_require_user_name" must also be enabled as it is mandadory. is_public_profile_enabled true Whether user names are required for completing registration. - is_user_name_required + is_user_login_require_user_name true diff --git a/web/admin/user/admin_user_activity_log.xhtml b/web/admin/user/admin_user_activity_log.xhtml index 9e714dc0..9d7ca70d 100644 --- a/web/admin/user/admin_user_activity_log.xhtml +++ b/web/admin/user/admin_user_activity_log.xhtml @@ -42,7 +42,7 @@ - + diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml index 407caada..b44a9eee 100644 --- a/web/admin/user/admin_user_export.xhtml +++ b/web/admin/user/admin_user_export.xhtml @@ -36,7 +36,7 @@ - + diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml index 546c8828..23890a9a 100644 --- a/web/admin/user/admin_user_list.xhtml +++ b/web/admin/user/admin_user_list.xhtml @@ -36,7 +36,7 @@ - + diff --git a/web/guest/user/user_login.xhtml b/web/guest/user/user_login.xhtml index 94ea425c..8cae955a 100644 --- a/web/guest/user/user_login.xhtml +++ b/web/guest/user/user_login.xhtml @@ -17,7 +17,7 @@ - + @@ -30,12 +30,12 @@
    - +     - + diff --git a/web/guest/user/user_lost_password.xhtml b/web/guest/user/user_lost_password.xhtml index fd429a45..b4a54a36 100644 --- a/web/guest/user/user_lost_password.xhtml +++ b/web/guest/user/user_lost_password.xhtml @@ -18,7 +18,7 @@ - +
    @@ -70,7 +70,7 @@
    - + diff --git a/web/guest/user/user_register.xhtml b/web/guest/user/user_register.xhtml index dfc58f17..f263e4c8 100644 --- a/web/guest/user/user_register.xhtml +++ b/web/guest/user/user_register.xhtml @@ -18,7 +18,7 @@ - + diff --git a/web/guest/user/user_register_page2.xhtml b/web/guest/user/user_register_page2.xhtml index fe89f876..7e180037 100644 --- a/web/guest/user/user_register_page2.xhtml +++ b/web/guest/user/user_register_page2.xhtml @@ -19,7 +19,7 @@ - +
    -- 2.39.5