From bf0eef674d589d1f93e20729ac0b8fe0657ef1d0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 1 Sep 2016 17:48:25 +0200
Subject: [PATCH] Please cherry-pick: - moved error messages outside table_row
 container - added error message for email address in admin contact data form
 - replaced FacetException with a nice JSF message

---
 .../user/JobsAdminUserWebRequestBean.java     |   3 +-
 .../admin/contact/admin_form_contact_data.tpl | 100 +++++++++---------
 2 files changed, 54 insertions(+), 49 deletions(-)

diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java
index d78d7062..5da800a5 100644
--- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java
@@ -279,7 +279,8 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J
 			throw new FaceletException(new UserNameAlreadyRegisteredException(user));
 		} else if ((this.beanHelper.getContact() == null) && (this.contactController.isEmailAddressRegistered(user.getUserContact()))) {
 			// Email address is already used
-			throw new FaceletException(new EmailAddressAlreadyRegisteredException(user));
+			this.showFacesMessage("admin_add_user:emailAddress", "ERROR_EMAIL_ADDRESS_ALREADY_USED"); //NOI18N
+			return ""; //NOI18N
 		} else if ((this.getUserPassword() == null && (this.getUserPasswordRepeat() == null)) || ((this.getUserPassword().isEmpty()) && (this.getUserPasswordRepeat().isEmpty()))) {
 			// Empty password entered, then generate one
 			password = UserUtils.createRandomPassword(JobsUserWebSessionController.MINIMUM_PASSWORD_LENGTH);
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
index 8e8f5431..f3b5f3b4 100644
--- a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
@@ -23,12 +23,12 @@
 				</div>
 
 				<div class="clear"></div>
-
-				<h:panelGroup styleClass="error_container" layout="block">
-					<h:message for="gender" errorClass="errors" fatalClass="errors" warnClass="errors" />
-				</h:panelGroup>
 			</div>
 
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="gender" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			</h:panelGroup>
+
 			<div class="table_row">
 				<div class="table_left_medium">
 					<h:outputLabel for="firstName" value="#{msg.ADMIN_PERSONAL_DATA_FIRST_NAME}" />
@@ -39,12 +39,12 @@
 				</div>
 
 				<div class="clear"></div>
-
-				<h:panelGroup styleClass="error_container" layout="block">
-					<h:message for="firstName" errorClass="errors" fatalClass="errors" warnClass="errors" />
-				</h:panelGroup>
 			</div>
 
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="firstName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			</h:panelGroup>
+
 			<div class="table_row">
 				<div class="table_left_medium">
 					<h:outputLabel for="title" value="#{msg.ADMIN_PERSONAL_DATA_TITLE}" />
@@ -55,12 +55,12 @@
 				</div>
 
 				<div class="clear"></div>
-
-				<h:panelGroup styleClass="error_container" layout="block">
-					<h:message for="title" errorClass="errors" fatalClass="errors" warnClass="errors" />
-				</h:panelGroup>
 			</div>
 
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="title" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			</h:panelGroup>
+
 			<div class="table_row">
 				<div class="table_left_medium">
 					<h:outputLabel for="familyName" value="#{msg.ADMIN_PERSONAL_DATA_FAMILY_NAME}" />
@@ -71,12 +71,12 @@
 				</div>
 
 				<div class="clear"></div>
-
-				<h:panelGroup styleClass="error_container" layout="block">
-					<h:message for="familyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
-				</h:panelGroup>
 			</div>
 
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="familyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			</h:panelGroup>
+
 			<div class="table_row">
 				<div class="table_left_medium">
 					<h:outputLabel for="street" value="#{msg.ADMIN_PERSONAL_DATA_STREET}" />
@@ -87,12 +87,12 @@
 				</div>
 
 				<div class="clear"></div>
-
-				<h:panelGroup styleClass="error_container" layout="block">
-					<h:message for="street" errorClass="errors" fatalClass="errors" warnClass="errors" />
-				</h:panelGroup>
 			</div>
 
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="street" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			</h:panelGroup>
+
 			<div class="table_row">
 				<div class="table_left_medium">
 					<h:outputLabel for="houseNumber" value="#{msg.ADMIN_PERSONAL_DATA_HOUSE_NUMBER}" />
@@ -105,12 +105,12 @@
 				</div>
 
 				<div class="clear"></div>
-
-				<h:panelGroup styleClass="error_container" layout="block">
-					<h:message for="houseNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
-				</h:panelGroup>
 			</div>
 
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="houseNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			</h:panelGroup>
+
 			<div class="table_row">
 				<div class="table_left_medium">
 					<h:outputLabel for="houseNumberExtension" value="#{msg.ADMIN_PERSONAL_DATA_HOUSE_NUMBER_EXTENSION}" />
@@ -121,12 +121,12 @@
 				</div>
 
 				<div class="clear"></div>
-
-				<h:panelGroup styleClass="error_container" layout="block">
-					<h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
-				</h:panelGroup>
 			</div>
 
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			</h:panelGroup>
+
 			<div class="table_row">
 				<div class="table_left_medium">
 					<h:outputLabel for="zipCode" value="#{msg.ADMIN_PERSONAL_DATA_ZIP_CODE}" />
@@ -139,12 +139,12 @@
 				</div>
 
 				<div class="clear"></div>
-
-				<h:panelGroup styleClass="error_container" layout="block">
-					<h:message for="zipCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
-				</h:panelGroup>
 			</div>
 
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="zipCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			</h:panelGroup>
+
 			<div class="table_row">
 				<div class="table_left_medium">
 					<h:outputLabel for="city" value="#{msg.ADMIN_PERSONAL_DATA_CITY}" />
@@ -155,12 +155,12 @@
 				</div>
 
 				<div class="clear"></div>
-
-				<h:panelGroup styleClass="error_container" layout="block">
-					<h:message for="city" errorClass="errors" fatalClass="errors" warnClass="errors" />
-				</h:panelGroup>
 			</div>
 
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="city" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			</h:panelGroup>
+
 			<div class="table_row">
 				<div class="table_left_medium">
 					<h:outputLabel for="country" value="#{msg.ADMIN_PERSONAL_DATA_COUNTRY_CODE}" />
@@ -174,12 +174,12 @@
 				</div>
 
 				<div class="clear"></div>
-
-				<h:panelGroup styleClass="error_container" layout="block">
-					<h:message for="country" errorClass="errors" fatalClass="errors" warnClass="errors" />
-				</h:panelGroup>
 			</div>
 
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="country" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			</h:panelGroup>
+
 			<div class="table_row">
 				<div class="table_left_medium">
 					<h:outputLabel value="#{msg.ADMIN_PERSONAL_DATA_PHONE_NUMBER}" />
@@ -239,15 +239,15 @@
 						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
 					</h:selectOneMenu>
-
-					<h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{adminContactController.mobileNumber}">
-						<f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
-					</h:inputText>
 				</div>
 
 				<div class="clear"></div>
 			</div>
 
+			<h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{adminContactController.mobileNumber}">
+				<f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
+			</h:inputText>
+
 			<div class="table_row">
 				<div class="table_left_medium">
 					<h:outputLabel for="emailAddress" value="#{msg.ADMIN_PERSONAL_DATA_EMAIL_ADDRESS}" />
@@ -260,6 +260,10 @@
 				<div class="clear"></div>
 			</div>
 
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="emailAddress" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			</h:panelGroup>
+
 			<div class="table_row">
 				<div class="table_left_medium">
 					<h:outputLabel for="contactBirthday" value="#{msg.ADMIN_PERSONAL_DATA_BIRTHDAY}" />
@@ -272,12 +276,12 @@
 				</div>
 
 				<div class="clear"></div>
-
-				<h:panelGroup styleClass="error_container" layout="block">
-					<h:message for="contactBirthday" errorClass="errors" fatalClass="errors" warnClass="errors" />
-				</h:panelGroup>
 			</div>
 
+			<h:panelGroup styleClass="error_container" layout="block">
+				<h:message for="contactBirthday" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			</h:panelGroup>
+
 			<div class="table_row">
 				<div class="table_left_medium">
 					<h:outputLabel for="contactComment" value="#{msg.ADMIN_PERSONAL_DATA_COMMENT}" />
-- 
2.39.5