From: Roland Häder <roland@mxchange.org>
Date: Fri, 1 Sep 2017 22:06:40 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bdf84b1e3890c565ed99e3093bee0b147aa1f0de;p=addressbook-war.git

Please cherry-pick:
- added wrong navigation rules, ops
- added noisy debug lines, somehow f:attribute is not ending up in validator
- removed rendered attribute from same JSF tag

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

diff --git a/src/java/org/mxchange/addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java b/src/java/org/mxchange/addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java
index d5d2b452..a321f588 100644
--- a/src/java/org/mxchange/addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java
+++ b/src/java/org/mxchange/addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java
@@ -65,6 +65,7 @@ public class AddressbookEmailAddressValidator extends BaseStringValidator {
 
 	@Override
 	public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException {
+		System.out.println(this.getClass().getSimpleName() + ".validate(): component.clientId=" + component.getClientId());
 		// The required field
 		String[] requiredFields = {"emailAddress", "emailAddressRepeat", "resendEmailAddress"}; //NOI18N
 
@@ -75,6 +76,7 @@ public class AddressbookEmailAddressValidator extends BaseStringValidator {
 		if (component.getAttributes().containsKey("allowEmptyValue")) { //NOI18N
 			// Get attribute
 			Object attribute = component.getAttributes().get("allowEmptyValue"); //NOI18N
+			System.out.println(this.getClass().getSimpleName() + ".validate():attribute=" + attribute);
 
 			// Make sure, it is Boolean as no String is accepted anymore
 			if (!(attribute instanceof String)) {
@@ -85,6 +87,7 @@ public class AddressbookEmailAddressValidator extends BaseStringValidator {
 			// Securely cast it
 			allowEmptyValue = Boolean.parseBoolean((String) attribute);
 		}
+		System.out.println(this.getClass().getSimpleName() + ".validate(): allowEmptyValue=" + allowEmptyValue);
 
 		// Pre-validation (example: not null, not a string, empty string ...)
 		super.preValidate(context, component, value, requiredFields, allowEmptyValue);
diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 53b166c9..ae5c79d3 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -170,14 +170,6 @@
 	</navigation-rule>
 	<navigation-rule>
 		<from-view-id>/guest/user/user_resend_link.xhtml</from-view-id>
-		<navigation-case>
-			<from-outcome>user_login</from-outcome>
-			<to-view-id>/login/login_index.xhtml</to-view-id>
-		</navigation-case>
-		<navigation-case>
-			<from-outcome>login_edit_user_data</from-outcome>
-			<to-view-id>/user/login_edit_user_data.xhtml</to-view-id>
-		</navigation-case>
 		<navigation-case>
 			<from-outcome>user_profile</from-outcome>
 			<to-view-id>/guest/user/user_profile.xhtml</to-view-id>
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
index 3ec8a69c..69267472 100644
--- 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
@@ -200,9 +200,9 @@
 				</div>
 
 				<div class="table-right-medium">
-					<h:inputText styleClass="input" id="emailAddress" size="10" maxlength="255" value="#{adminContactController.emailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
-						<f:validator validatorId="EmailAddressValidator" />
-						<f:attribute name="allowEmptyValue" value="#{allowEmptyRequiredData}" rendered="#{not empty allowEmptyRequiredData}" />
+					<h:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{adminContactController.emailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
+						<f:validator for="emailAddress" validatorId="EmailAddressValidator" />
+						<f:attribute name="allowEmptyValue" value="#{allowEmptyRequiredData}" />
 					</h:inputText>
 				</div>
 			</h:panelGroup>