From 4a4746aeffa689e01afc376697c1cc0c1bef65b7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sun, 27 Aug 2017 00:56:30 +0200
Subject: [PATCH] Please cherry-pick: - converted template to custom JSF tag
 widgets:outputAdminContactDataFormFields   and replaced all occurrences, 2
 optional parameter "formMode" (ex. "mode" and   "allowEmptyRequiredData" are
 accepted
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../admin/contact/admin_form_contact_data.tpl   |  3 ---
 .../user_personal_title_table_row.tpl           |  2 +-
 .../user/admin_form_user_personal_data.tpl      |  3 ++-
 web/WEB-INF/widgets.jsf.taglib.xml              | 17 +++++++++++++++++
 web/admin/contact/admin_contact_edit.xhtml      |  4 +---
 web/admin/contact/admin_contact_list.xhtml      |  4 +---
 6 files changed, 22 insertions(+), 11 deletions(-)
 rename web/WEB-INF/{templates => resources/tags}/admin/contact/admin_form_contact_data.tpl (98%)

diff --git a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl b/web/WEB-INF/resources/tags/admin/contact/admin_form_contact_data.tpl
similarity index 98%
rename from web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
rename to web/WEB-INF/resources/tags/admin/contact/admin_form_contact_data.tpl
index 59ac6584..964049c0 100644
--- a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/contact/admin_form_contact_data.tpl
@@ -7,9 +7,6 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<h:panelGroup styleClass="para" layout="block">
-		<h:outputText value="#{allowEmptyRequiredData}" rendered="#{not empty allowEmptyRequiredData}" />
-		<h:outputText value="allowEmptyRequiredData is empty" rendered="#{empty allowEmptyRequiredData}" />
-
 		<fieldset class="fieldset" id="personal_data">
 			<legend title="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE}">
 				<h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND}" />
diff --git a/web/WEB-INF/resources/tags/table_rows/user_personal_title_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/user_personal_title_table_row.tpl
index c28166e7..ce8b5e88 100644
--- a/web/WEB-INF/resources/tags/table_rows/user_personal_title_table_row.tpl
+++ b/web/WEB-INF/resources/tags/table_rows/user_personal_title_table_row.tpl
@@ -15,7 +15,7 @@
 			</div>
 
 			<div class="table-right-medium">
-				<h:selectOneMenu styleClass="select" id="userPersonalTitle" value="#{targetController.personalTitle}" required="#{featureController.isFeatureEnabled(targetController.controllerType.concat('_personal_title'))}" requiredMessage="#{msg.FIELD_PERSONAL_TITLE_REQUIRED}">
+				<h:selectOneMenu styleClass="select" id="userPersonalTitle" value="#{targetController.personalTitle}" required="#{(empty allowEmptyRequiredData or not allowEmptyRequiredData) and featureController.isFeatureEnabled(targetController.controllerType.concat('_personal_title'))}" requiredMessage="#{msg.FIELD_PERSONAL_TITLE_REQUIRED}">
 					<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" />
 					<f:selectItems value="#{genderController.selectableGenders}" var="personalTitle" itemValue="#{personalTitle}" itemLabel="#{msg[personalTitle.messageKey]}" />
 				</h:selectOneMenu>
diff --git a/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl
index 9628451e..53c67426 100644
--- a/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
 	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
@@ -13,5 +14,5 @@
 		<h:outputText value="#{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}" />
 	</div>
 
-	<ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl" />
+	<widgets:outputAdminContactDataFormFields />
 </ui:composition>
diff --git a/web/WEB-INF/widgets.jsf.taglib.xml b/web/WEB-INF/widgets.jsf.taglib.xml
index aa4259be..e0d1ac34 100644
--- a/web/WEB-INF/widgets.jsf.taglib.xml
+++ b/web/WEB-INF/widgets.jsf.taglib.xml
@@ -128,4 +128,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 			<type>org.mxchange.jcoreee.bean.faces.BaseFacesBean</type>
 		</attribute>
 	</tag>
+	<tag>
+		<tag-name>outputAdminContactDataFormFields</tag-name>
+		<description>This tag renders a fieldset for administrative purposes of contact data.</description>
+		<source>resources/tags/admin/contact/admin_form_contact_data.tpl</source>
+		<attribute>
+			<name>allowEmptyRequiredData</name>
+			<description>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.</description>
+			<required>false</required>
+			<type>java.lang.Boolean</type>
+		</attribute>
+		<attribute>
+			<name>formMode</name>
+			<description>Mode of the form, can be one of "add" or "edit", defaulting to "add".</description>
+			<required>false</required>
+			<type>java.lang.String</type>
+		</attribute>
+	</tag>
 </facelet-taglib>
diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml
index 0835fd47..6cef9784 100644
--- a/web/admin/contact/admin_contact_edit.xhtml
+++ b/web/admin/contact/admin_contact_edit.xhtml
@@ -36,9 +36,7 @@
 					<h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE}" />
 				</div>
 
-				<ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl">
-					<ui:param name="mode" value="edit" />
-				</ui:include>
+				<widgets:outputAdminContactDataFormFields formMode="edit" />
 
 				<div class="table-footer">
 					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml
index a2b8c2a0..0644b20a 100644
--- a/web/admin/contact/admin_contact_list.xhtml
+++ b/web/admin/contact/admin_contact_list.xhtml
@@ -81,9 +81,7 @@
 					<h:outputText value="#{msg.ADMIN_ADD_CONTACT_MINIMUM_DATA}" />
 				</div>
 
-				<ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl">
-					<ui:param name="allowEmptyRequiredData" value="true" />
-				</ui:include>
+				<widgets:outputAdminContactDataFormFields allowEmptyRequiredData="true" />
 
 				<div class="table-footer">
 					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-- 
2.39.5