From d2d5ad20303176392b97d25fbf0c2365dd4c5d1d Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Mon, 11 Apr 2016 19:14:25 +0200
Subject: [PATCH] as the template gender_selection_box.tpl is generic, the
 controller needs to be replaceable by any other template or page.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../mxchange/localization/bundle_de_DE.properties  |  1 +
 .../mxchange/localization/bundle_en_US.properties  |  1 +
 .../templates/admin/admin_form_personal_data.tpl   |  4 +++-
 .../templates/generic/form_personal_data.tpl       |  4 +++-
 .../templates/generic/gender_selection_box.tpl     | 14 ++++++++++----
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 7f8a7caf..17ae1be3 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -396,3 +396,4 @@ ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME=Land:
 #@TODO Please fix German umlauts!
 ADMIN_LINK_EDIT_DELETE_COUNTRY_TITLE=Aendern oder loeschen der Laenderdaten
 COUNTRY_GERMANY=Deutschland
+ERROR_TARGET_CONTROLLER_PARAMETER_NOT_SET=Fehler: Der Parameter 'targetController' ist nicht gesetzt.
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 42060c92..65bff98d 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -336,3 +336,4 @@ ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX=Dial prefix outside:
 ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME=Country:
 ADMIN_LINK_EDIT_DELETE_COUNTRY_TITLE=Edit or delete country
 COUNTRY_GERMANY=Germany
+ERROR_TARGET_CONTROLLER_PARAMETER_NOT_SET=Error: The parameter 'targetController' is not set.
diff --git a/web/WEB-INF/templates/admin/admin_form_personal_data.tpl b/web/WEB-INF/templates/admin/admin_form_personal_data.tpl
index fad545df..3f98abad 100644
--- a/web/WEB-INF/templates/admin/admin_form_personal_data.tpl
+++ b/web/WEB-INF/templates/admin/admin_form_personal_data.tpl
@@ -19,7 +19,9 @@
 				</div>
 
 				<div class="table_right">
-					<ui:include src="/WEB-INF/templates/generic/gender_selection_box.tpl" />
+					<ui:include src="/WEB-INF/templates/generic/gender_selection_box.tpl">
+						<ui:param name="targetController" value="#{adminUserController}" />
+					</ui:include>
 				</div>
 
 				<div class="clear"></div>
diff --git a/web/WEB-INF/templates/generic/form_personal_data.tpl b/web/WEB-INF/templates/generic/form_personal_data.tpl
index bb38e72f..f5f1fcdc 100644
--- a/web/WEB-INF/templates/generic/form_personal_data.tpl
+++ b/web/WEB-INF/templates/generic/form_personal_data.tpl
@@ -19,7 +19,9 @@
 				</div>
 
 				<div class="table_right">
-					<ui:include src="/WEB-INF/templates/generic/gender_selection_box.tpl" />
+					<ui:include src="/WEB-INF/templates/generic/gender_selection_box.tpl">
+						<ui:param  name="targetController" value="#{userController}" />
+					</ui:include>
 				</div>
 
 				<div class="clear"></div>
diff --git a/web/WEB-INF/templates/generic/gender_selection_box.tpl b/web/WEB-INF/templates/generic/gender_selection_box.tpl
index cbe55b02..f7b93903 100644
--- a/web/WEB-INF/templates/generic/gender_selection_box.tpl
+++ b/web/WEB-INF/templates/generic/gender_selection_box.tpl
@@ -5,8 +5,14 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://java.sun.com/jsf/facelets">
 
-	<h:selectOneMenu class="select" id="gender" value="#{userController.gender}">
-		<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-		<f:selectItems value="#{gender.selectableGenders}" var="g" itemValue="#{g}" itemLabel="#{msg[g.messageKey]}" />
-	</h:selectOneMenu>
+	<ui:fragment rendered="#{not empty targetController}">
+		<h:selectOneMenu class="select" id="gender" value="#{targetController.gender}">
+			<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+			<f:selectItems value="#{genderController.selectableGenders}" var="g" itemValue="#{g}" itemLabel="#{msg[g.messageKey]}" />
+		</h:selectOneMenu>
+	</ui:fragment>
+
+	<ui:fragment rendered="#{empty targetController}">
+		<h:outputText class="errors" value="#{msg.ERROR_TARGET_CONTROLLER_PARAMETER_NOT_SET}" />
+	</ui:fragment>
 </ui:composition>
-- 
2.39.5