From: Roland Häder Date: Mon, 1 Jun 2020 13:32:24 +0000 (+0200) Subject: Please cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5d8d2a902cf9d92232739ee5770a272fd6b03beb;p=jjobs-war.git Please cherry-pick: - all extra email address validators (so not the generic one) have no attribute "allowEmptyRequiredData" anymore as the email address for them (e.g. branch office) is always optional - converted own JSF tag core:outputAdminContactDataFormFields to template again - reformatted some JSF tags to have each attribute in a single line - the gender-specific backing bean was superflous since there is a "static data" backing bean - added missing i18n string COUNTRY_POLAND (country was added in JFinancials) - fixed tpzo in i18n key Signed-off-by: Roland Häder --- diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestBean.java index ff309d80..248a06b6 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestBean.java @@ -479,17 +479,6 @@ public class JobsContactWebRequestBean extends BaseJobsBean implements JobsConta this.comment = comment; } - @Override - public String getControllerType () { - return "general"; //NOI18N - } - - @Override - @Deprecated - public void setControllerType (final String controllerType) { - throw new UnsupportedOperationException("Setting controller type is not supported."); //NOI18N - } - /** * Getter for country instance *

diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestController.java b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestController.java index 3f58bb01..205a6c83 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestController.java @@ -50,23 +50,6 @@ public interface JobsContactWebRequestController extends Serializable { */ Contact createContactInstance (); - /** - * Getter for controller type - *

- * @return controller type - */ - String getControllerType (); - - /** - * Setter for controller type - *

- * @param controllerType Controller type - *

- * @deprecated Don't use this method. - */ - @Deprecated - void setControllerType (final String controllerType); - /** * Checks whether contact instance's email address is used *

diff --git a/src/java/org/mxchange/jjobs/beans/data/JobsDataWebApplicationBean.java b/src/java/org/mxchange/jjobs/beans/data/JobsDataWebApplicationBean.java index c8eed438..bef50440 100644 --- a/src/java/org/mxchange/jjobs/beans/data/JobsDataWebApplicationBean.java +++ b/src/java/org/mxchange/jjobs/beans/data/JobsDataWebApplicationBean.java @@ -65,11 +65,9 @@ public class JobsDataWebApplicationBean extends BaseJobsBean { } /** - * Returns an array of all profile modes

- * @ - * - * - * return An array of all profile modes + * Returns an array of all profile modes + *

+ * @return An array of all profile modes */ public ProfileMode[] getProfileModes () { return ProfileMode.values(); @@ -83,4 +81,5 @@ public class JobsDataWebApplicationBean extends BaseJobsBean { public UserAccountStatus[] getUserAccountStatuses () { return UserAccountStatus.values(); } + } diff --git a/src/java/org/mxchange/jjobs/beans/helper/JobsWebViewHelperBean.java b/src/java/org/mxchange/jjobs/beans/helper/JobsWebViewHelperBean.java index 4c6361f4..3d525cea 100644 --- a/src/java/org/mxchange/jjobs/beans/helper/JobsWebViewHelperBean.java +++ b/src/java/org/mxchange/jjobs/beans/helper/JobsWebViewHelperBean.java @@ -456,7 +456,7 @@ public class JobsWebViewHelperBean extends BaseJobsBean implements JobsWebViewHe // Is basic company data set? if (basicData instanceof BasicData) { // Short or long name? - if (useShortName) { + if (useShortName || basicData.getCompanyName() == null) { // Add company's long name sb.append(basicData.getCompanyShortName()); //NOI18N } else { diff --git a/src/java/org/mxchange/jjobs/beans/localization/JobsLocalizationSessionBean.java b/src/java/org/mxchange/jjobs/beans/localization/JobsLocalizationSessionBean.java index ef60f127..ae92b9bc 100644 --- a/src/java/org/mxchange/jjobs/beans/localization/JobsLocalizationSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/localization/JobsLocalizationSessionBean.java @@ -182,7 +182,7 @@ public class JobsLocalizationSessionBean extends BaseJobsBean implements JobsLoc // Has a matching locale if (null == newLocale) { // Throw NPE - throw new NullPointerException("this.localeCode=" + this.getLocaleCode() + " cannot be found."); //NOI18N + throw new NullPointerException(MessageFormat.format("this.localeCode={0} cannot be found.", this.getLocaleCode())); //NOI18N } // Then change it @@ -193,7 +193,13 @@ public class JobsLocalizationSessionBean extends BaseJobsBean implements JobsLoc } @Override - public String formatCurrency (final Float amount) { + public String formatFloatNumber (final Float amount) { + // Is parameter valid? + if (null == amount) { + // Throw NPE + throw new NullPointerException("amount is null"); //NOI18N + } + // Format amount return NUMBER_FORMAT.format(amount); } diff --git a/src/java/org/mxchange/jjobs/beans/localization/JobsLocalizationSessionController.java b/src/java/org/mxchange/jjobs/beans/localization/JobsLocalizationSessionController.java index 5dead2fe..ff5efc23 100644 --- a/src/java/org/mxchange/jjobs/beans/localization/JobsLocalizationSessionController.java +++ b/src/java/org/mxchange/jjobs/beans/localization/JobsLocalizationSessionController.java @@ -33,7 +33,7 @@ public interface JobsLocalizationSessionController extends Serializable { *

* @return Formatted string */ - String formatCurrency (final Float amount); + String formatFloatNumber (final Float amount); /** * Getter for locale diff --git a/src/java/org/mxchange/jjobs/validator/emailaddress/JobsEmailAddressValidator.java b/src/java/org/mxchange/jjobs/validator/emailaddress/JobsEmailAddressValidator.java index 1c88b40a..b3ae2972 100644 --- a/src/java/org/mxchange/jjobs/validator/emailaddress/JobsEmailAddressValidator.java +++ b/src/java/org/mxchange/jjobs/validator/emailaddress/JobsEmailAddressValidator.java @@ -65,6 +65,7 @@ public class JobsEmailAddressValidator extends BaseStringValidator { * Default constructor */ public JobsEmailAddressValidator () { + // Set allowEmpty to FALSE by default this.allowEmptyRequiredData = Boolean.FALSE; } @@ -79,6 +80,18 @@ public class JobsEmailAddressValidator extends BaseStringValidator { @Override public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException { + // Validate parameter + if (null == context) { + // Throw NPE + throw new NullPointerException("Parameter context is null"); //NOI18N + } else if (null == component) { + // Throw NPE again + throw new NullPointerException("Parameter component is null"); //NOI18N + } else if (null == this.allowEmptyRequiredData) { + // Should not be NULL + throw new IllegalStateException("this.allowEmptyRequiredData was set to null, this should not happen."); //NOI18N + } + // The required field final String[] requiredFields = {"emailAddress", "emailAddressRepeat", "resendEmailAddress"}; //NOI18N diff --git a/src/java/org/mxchange/jjobs/validator/emailaddress/basicdata/JobsBasicDataEmailAddressValidator.java b/src/java/org/mxchange/jjobs/validator/emailaddress/basicdata/JobsBasicDataEmailAddressValidator.java index 3aecb692..29d17df5 100644 --- a/src/java/org/mxchange/jjobs/validator/emailaddress/basicdata/JobsBasicDataEmailAddressValidator.java +++ b/src/java/org/mxchange/jjobs/validator/emailaddress/basicdata/JobsBasicDataEmailAddressValidator.java @@ -56,42 +56,27 @@ public class JobsBasicDataEmailAddressValidator extends BaseStringValidator { */ private static final long serialVersionUID = 187_536_745_607_195L; - /** - * Whether empty data is allowed - */ - private Boolean allowEmptyRequiredData; - - /** - * Default constructor - */ - public JobsBasicDataEmailAddressValidator () { - this.allowEmptyRequiredData = Boolean.FALSE; - } - - /** - * Setter for allowEmptyRequiredData flag - *

- * @param allowEmptyRequiredData Whether empty values are allowed - */ - public void setAllowEmptyRequiredData (final Boolean allowEmptyRequiredData) { - this.allowEmptyRequiredData = allowEmptyRequiredData; - } - @Override public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException { + // Validate parameter + if (null == context) { + // Throw NPE + throw new NullPointerException("Parameter context is null"); //NOI18N + } else if (null == component) { + // Throw NPE again + throw new NullPointerException("Parameter component is null"); //NOI18N + } + // The required field final String[] requiredFields = {"emailAddress", "emailAddressRepeat", "resendEmailAddress"}; //NOI18N // Pre-validation (example: not null, not a string, empty string ...) - super.preValidate(context, component, value, requiredFields, this.allowEmptyRequiredData); + super.preValidate(context, component, value, requiredFields, Boolean.TRUE); // Is the email address empty and allowed? - if (null == value && this.allowEmptyRequiredData) { + if (null == value) { // Then accept this here return; - } else if (null == value) { - // Abort here - throw new ValidatorException(new FacesMessage("No empty email address allowed.")); //NOI18N } // Get string from object ... ;-) diff --git a/src/java/org/mxchange/jjobs/validator/emailaddress/branchoffice/JobsBranchOfficeEmailAddressValidator.java b/src/java/org/mxchange/jjobs/validator/emailaddress/branchoffice/JobsBranchOfficeEmailAddressValidator.java index 047e07dd..e6cb1e23 100644 --- a/src/java/org/mxchange/jjobs/validator/emailaddress/branchoffice/JobsBranchOfficeEmailAddressValidator.java +++ b/src/java/org/mxchange/jjobs/validator/emailaddress/branchoffice/JobsBranchOfficeEmailAddressValidator.java @@ -56,42 +56,27 @@ public class JobsBranchOfficeEmailAddressValidator extends BaseStringValidator { */ private static final long serialVersionUID = 187_536_745_607_195L; - /** - * Whether empty data is allowed - */ - private Boolean allowEmptyRequiredData; - - /** - * Default constructor - */ - public JobsBranchOfficeEmailAddressValidator () { - this.allowEmptyRequiredData = Boolean.FALSE; - } - - /** - * Setter for allowEmptyRequiredData flag - *

- * @param allowEmptyRequiredData Whether empty values are allowed - */ - public void setAllowEmptyRequiredData (final Boolean allowEmptyRequiredData) { - this.allowEmptyRequiredData = allowEmptyRequiredData; - } - @Override public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException { + // Validate parameter + if (null == context) { + // Throw NPE + throw new NullPointerException("Parameter context is null"); //NOI18N + } else if (null == component) { + // Throw NPE again + throw new NullPointerException("Parameter component is null"); //NOI18N + } + // The required field final String[] requiredFields = {"emailAddress", "emailAddressRepeat", "resendEmailAddress"}; //NOI18N // Pre-validation (example: not null, not a string, empty string ...) - super.preValidate(context, component, value, requiredFields, this.allowEmptyRequiredData); + super.preValidate(context, component, value, requiredFields, Boolean.TRUE); - // Is the email address empty and allowed? - if (null == value && this.allowEmptyRequiredData) { + // Is the email address empty? + if (null == value) { // Then accept this here return; - } else if (null == value) { - // Abort here - throw new ValidatorException(new FacesMessage("No empty email address allowed.")); //NOI18N } // Get string from object ... ;-) diff --git a/src/java/org/mxchange/jjobs/validator/emailaddress/employee/JobsEmployeeEmailAddressValidator.java b/src/java/org/mxchange/jjobs/validator/emailaddress/employee/JobsEmployeeEmailAddressValidator.java index e1525642..e702422c 100644 --- a/src/java/org/mxchange/jjobs/validator/emailaddress/employee/JobsEmployeeEmailAddressValidator.java +++ b/src/java/org/mxchange/jjobs/validator/emailaddress/employee/JobsEmployeeEmailAddressValidator.java @@ -56,42 +56,27 @@ public class JobsEmployeeEmailAddressValidator extends BaseStringValidator { */ private static final long serialVersionUID = 187_536_745_607_196L; - /** - * Whether empty data is allowed - */ - private Boolean allowEmptyRequiredData; - - /** - * Default constructor - */ - public JobsEmployeeEmailAddressValidator () { - this.allowEmptyRequiredData = Boolean.FALSE; - } - - /** - * Setter for allowEmptyRequiredData flag - *

- * @param allowEmptyRequiredData Whether empty values are allowed - */ - public void setAllowEmptyRequiredData (final Boolean allowEmptyRequiredData) { - this.allowEmptyRequiredData = allowEmptyRequiredData; - } - @Override public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException { + // Validate parameter + if (null == context) { + // Throw NPE + throw new NullPointerException("Parameter context is null"); //NOI18N + } else if (null == component) { + // Throw NPE again + throw new NullPointerException("Parameter component is null"); //NOI18N + } + // The required field final String[] requiredFields = {"employeeEmailAddress"}; //NOI18N // Pre-validation (example: not null, not a string, empty string ...) - super.preValidate(context, component, value, requiredFields, this.allowEmptyRequiredData); + super.preValidate(context, component, value, requiredFields, Boolean.TRUE); // Is the email address empty and allowed? - if (null == value && this.allowEmptyRequiredData) { + if (null == value) { // Then accept this here return; - } else if (null == value) { - // Abort here - throw new ValidatorException(new FacesMessage("No empty email address allowed.")); //NOI18N } // Get string from object ... ;-) diff --git a/src/java/org/mxchange/jjobs/validator/emailaddress/headquarter/JobsHeadquarterEmailAddressValidator.java b/src/java/org/mxchange/jjobs/validator/emailaddress/headquarter/JobsHeadquarterEmailAddressValidator.java index bca2a332..c54d4571 100644 --- a/src/java/org/mxchange/jjobs/validator/emailaddress/headquarter/JobsHeadquarterEmailAddressValidator.java +++ b/src/java/org/mxchange/jjobs/validator/emailaddress/headquarter/JobsHeadquarterEmailAddressValidator.java @@ -56,43 +56,27 @@ public class JobsHeadquarterEmailAddressValidator extends BaseStringValidator { */ private static final long serialVersionUID = 187_536_745_607_194L; - /** - * Whether empty data is allowed - */ - private Boolean allowEmptyRequiredData; - - /** - * Default constructor - */ - public JobsHeadquarterEmailAddressValidator () { - // Default is not allowed - this.allowEmptyRequiredData = Boolean.FALSE; - } - - /** - * Setter for allowEmptyRequiredData flag - *

- * @param allowEmptyRequiredData Whether empty values are allowed - */ - public void setAllowEmptyRequiredData (final Boolean allowEmptyRequiredData) { - this.allowEmptyRequiredData = allowEmptyRequiredData; - } - @Override public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException { + // Validate parameter + if (null == context) { + // Throw NPE + throw new NullPointerException("Parameter context is null"); //NOI18N + } else if (null == component) { + // Throw NPE again + throw new NullPointerException("Parameter component is null"); //NOI18N + } + // The required field final String[] requiredFields = {"emailAddress", "emailAddressRepeat", "resendEmailAddress"}; //NOI18N // Pre-validation (example: not null, not a string, empty string ...) - super.preValidate(context, component, value, requiredFields, this.allowEmptyRequiredData); + super.preValidate(context, component, value, requiredFields, Boolean.TRUE); // Is the email address empty and allowed? - if (null == value && this.allowEmptyRequiredData) { + if (null == value) { // Then accept this here return; - } else if (null == value) { - // Abort here - throw new ValidatorException(new FacesMessage("No empty email address allowed.")); //NOI18N } // Get string from object ... ;-) diff --git a/src/java/org/mxchange/localization/generic_de_DE.properties b/src/java/org/mxchange/localization/generic_de_DE.properties index 6b7efdb4..ade43ddf 100644 --- a/src/java/org/mxchange/localization/generic_de_DE.properties +++ b/src/java/org/mxchange/localization/generic_de_DE.properties @@ -135,6 +135,8 @@ COUNTRY_GREECE=Griechenland COUNTRY_ITALIA=Italien COUNTRY_NETHERLANDS=Niederlande COUNTRY_PHILIPPINES=Philippinen +COUNTRY_POLAND=Polen +COUNTRY_SWEDEN=Schweden COUNTRY_TURKEY=T\u00fcrkei COUNTRY_THAILAND=Thailand COUNTRY_UNITED_STATES_OF_AMERICA=U.S.A. @@ -576,7 +578,7 @@ ADMIN_COUNTRY_PHONE_CODE_REQUIRED=Bitte geben Sie die Vorwahl dieses Landes ein ADMIN_COUNTRY_EXTERNAL_DIAL_PREFIX_REQUIRED=Bitte geben Sie die Vorwahl f\u00fcr Gespr\u00e4che ausserhalb des Ortes ein (meistens 0). ADMIN_COUNTRY_I18N_KEY_REQUIRED=Bitte geben Sie den Schl\u00fcssel f\u00fcr das Sprachpaket ein (z.B. COUNTRY_GERMANY f\u00fcr Deutschland). ADMIN_COUNTRY_CODE_REQUIRED=Bitte geben Sie den L\u00e4ndercode ein (z.B. DE f\u00fcr Deutschland). -ADMIN_COUNTRY_ABORAD_DIAL_PREFIX_REQUIRED=Bitte geben Sie die Vorwahl f\u00fcr Auslandsgespr\u00e4che ein (z.B. + oder 00). +ADMIN_COUNTRY_ABROAD_DIAL_PREFIX_REQUIRED=Bitte geben Sie die Vorwahl f\u00fcr Auslandsgespr\u00e4che ein (z.B. + oder 00). ADMIN_MOBILE_PROVIDER_DIAL_PREFIX_REQUIRED=Bitte geben Sie die Vorwahl ohne f\u00fchrende Null f\u00fcr den Mobilfunkanbieter ein (z.B. 177 f\u00fcr E+). USER_LOGIN_MUST_CHANGE_PASSWORD=Sie m\u00fcssen Ihr Passwort \u00e4ndern. Dies darf nicht mit dem aktuellen \u00fcbereinstimmen. ADMIN_LOGOUT_TITLE=Aus dem Administrationsbereich ausloggen diff --git a/src/java/org/mxchange/localization/generic_en_US.properties b/src/java/org/mxchange/localization/generic_en_US.properties index 37d3e8bb..5c6a3c16 100644 --- a/src/java/org/mxchange/localization/generic_en_US.properties +++ b/src/java/org/mxchange/localization/generic_en_US.properties @@ -135,6 +135,8 @@ COUNTRY_GREECE=Greece COUNTRY_ITALIA=Italia COUNTRY_NETHERLANDS=Netherlands COUNTRY_PHILIPPINES=Philippines +COUNTRY_POLAND=Poland +COUNTRY_SWEDEN=Sweden COUNTRY_THAILAND=Thailand COUNTRY_TURKEY=Turkey COUNTRY_UNITED_STATES_OF_AMERICA=U.S.A. @@ -557,7 +559,7 @@ ADMIN_COUNTRY_PHONE_CODE_REQUIRED=Please enter dial prefix for this country (e.g ADMIN_COUNTRY_EXTERNAL_DIAL_PREFIX_REQUIRED=Please enter dial prefix for calls outside the current city. ADMIN_COUNTRY_I18N_KEY_REQUIRED=Please enter the key for the language package (e.g. COUNTRY_USA for U.S.A.). ADMIN_COUNTRY_CODE_REQUIRED=Please enter country code (e.g. US for U.S.A.). -ADMIN_COUNTRY_ABORAD_DIAL_PREFIX_REQUIRED=Please enter dial prefix for abroad calls (e.g. + or 00). +ADMIN_COUNTRY_ABROAD_DIAL_PREFIX_REQUIRED=Please enter dial prefix for abroad calls (e.g. + or 00). ADMIN_MOBILE_PROVIDER_DIAL_PREFIX_REQUIRED=Please enter dial prefix for mobile provider. USER_LOGIN_MUST_CHANGE_PASSWORD=Please change your password. It must not match with your current one. ADMIN_LOGOUT_TITLE=Logout from administration area diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index 697a802f..cf0dee81 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -756,8 +756,8 @@ /admin/basic_data/admin_basic_data_assign_owner.xhtml - admin_show_contact - /admin/contact/admin_contact_show.xhtml + admin_show_employee + /admin/employee/admin_employee_show.xhtml admin_assign_basic_data_employee diff --git a/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl deleted file mode 100644 index 769aef85..00000000 --- a/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - diff --git a/web/WEB-INF/resources/tags/input/selection_box/personal_title_selection_box.tpl b/web/WEB-INF/resources/tags/input/selection_box/personal_title_selection_box.tpl index 8731f8cc..5185f534 100644 --- a/web/WEB-INF/resources/tags/input/selection_box/personal_title_selection_box.tpl +++ b/web/WEB-INF/resources/tags/input/selection_box/personal_title_selection_box.tpl @@ -9,13 +9,12 @@ - + diff --git a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl new file mode 100644 index 00000000..568fcf76 --- /dev/null +++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
  • + +
    • +
+ + diff --git a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl index 5ba60c7f..8cf9e48d 100644 --- a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl +++ b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl @@ -23,7 +23,14 @@
- +
diff --git a/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl b/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl index 3efb0ef9..9d9dede6 100644 --- a/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl +++ b/web/WEB-INF/templates/admin/employee/admin_form_employee_data.tpl @@ -106,8 +106,14 @@ - - + + diff --git a/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl b/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl index 39970174..3b54506d 100644 --- a/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl +++ b/web/WEB-INF/templates/admin/headquarter/admin_form_headquarter.tpl @@ -79,7 +79,7 @@ value="#{adminHeadquarterActionController.headquarterEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}" > - + diff --git a/web/WEB-INF/validators.jsf.taglib.xml b/web/WEB-INF/validators.jsf.taglib.xml index b50b5526..7d4fb532 100644 --- a/web/WEB-INF/validators.jsf.taglib.xml +++ b/web/WEB-INF/validators.jsf.taglib.xml @@ -39,48 +39,24 @@ along with this program. If not, see . BasicDataEmailAddressValidator - - Whether email address is allowed to be empty. - allowEmptyRequiredData - java.lang.Boolean - false - branchOfficeEmailAddressValidator BranchOfficeEmailAddressValidator - - Whether email address is allowed to be empty. - allowEmptyRequiredData - java.lang.Boolean - false - employeeEmailAddressValidator EmployeeEmailAddressValidator - - Whether email address is allowed to be empty. - allowEmptyRequiredData - java.lang.Boolean - false - headquarterEmailAddressValidator HeadquarterEmailAddressValidator - - Whether email address is allowed to be empty. - allowEmptyRequiredData - java.lang.Boolean - false - urlValidator diff --git a/web/WEB-INF/widgets.jsf.taglib.xml b/web/WEB-INF/widgets.jsf.taglib.xml index b2e5cbfe..73d86d1d 100644 --- a/web/WEB-INF/widgets.jsf.taglib.xml +++ b/web/WEB-INF/widgets.jsf.taglib.xml @@ -66,18 +66,6 @@ along with this program. If not, see . outputPersonalTitleSelectionBox This tag renders a selection box for user contact's personal title (Mr./Mrs.). resources/tags/input/selection_box/personal_title_selection_box.tpl - - allowEmptyRequiredData - Whether allow the personal title to be left empty. This might be the case when you create a user and want to select a contact from a selection box. EL code resolving to a boolean may be allowed here. - false - java.lang.Boolean - - - rendered - Whether this tag is being rendered by JSF engine (default: true). - false - java.lang.Boolean - targetController A target backing bean (EL code resolving into it) extending at least BaseFacesBean where to set the data in. @@ -86,23 +74,6 @@ along with this program. If not, see . org.mxchange.jcoreee.bean.faces.BaseFacesBean - - outputAdminContactDataFormFields - This tag renders a fieldset for administrative purposes of contact data. - resources/tags/admin/form_data/contact/admin_form_contact_data.tpl - - allowEmptyRequiredData - Whether allow the personal title to be left empty. This might be the case when you create a user and want to select a contact from a selection box. EL code resolving to a boolean may be allowed here. - false - java.lang.Boolean - - - rendered - Whether this tag is being rendered by JSF engine (default: true). - false - java.lang.Boolean - - outputAdminFaxDataFormFields This tag renders a fieldset for administrative purposes of fax data. diff --git a/web/admin/basic_data/admin_basic_data_list.xhtml b/web/admin/basic_data/admin_basic_data_list.xhtml index 606fc527..e6f5114c 100644 --- a/web/admin/basic_data/admin_basic_data_list.xhtml +++ b/web/admin/basic_data/admin_basic_data_list.xhtml @@ -444,7 +444,7 @@ value="#{adminBasicCompanyDataController.companyEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}" > - + diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml index d2b697b8..0dc8a1a3 100644 --- a/web/admin/contact/admin_contact_edit.xhtml +++ b/web/admin/contact/admin_contact_edit.xhtml @@ -46,7 +46,7 @@ - + - + diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml index 425ae0d4..b807d457 100644 --- a/web/admin/user/admin_user_list.xhtml +++ b/web/admin/user/admin_user_list.xhtml @@ -346,7 +346,7 @@ - +