From 7e88f0e94000192f439e4f680e465ab7fdc61149 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 29 Aug 2016 17:01:32 +0200
Subject: [PATCH] Please cherry-pick: - rewrote template to have a
 targetController parameter (must be set)

---
 .../user/user_enter_current_password.tpl      | 51 +++++++++++--------
 web/user/login_change_password.xhtml          |  4 +-
 web/user/login_change_personal_data.xhtml     |  4 +-
 3 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
index cbe9d2d4..0a6ab254 100644
--- a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
+++ b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
@@ -5,29 +5,38 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<div class="para">
-		<fieldset class="fieldset" id="current_password">
-			<legend title="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND_TITLE}">
-				<h:outputText value="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND}" />
-			</legend>
+	<ui:fragment rendered="#{empty targetController}">
+		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:param name="message" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" />
+			<ui:param name="styleClass" value="errors" />
+		</ui:include>
+	</ui:fragment>
 
-			<div class="table_row">
-				<div class="table_left">
-					<h:outputLabel for="currentPassword" value="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRM}" />
-				</div>
+	<ui:fragment rendered="#{not empty targetController}">
+		<div class="para">
+			<fieldset class="fieldset" id="current_password">
+				<legend title="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND_TITLE}">
+					<h:outputText value="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND}" />
+				</legend>
 
-				<div class="table_right">
-					<h:inputSecret styleClass="input" id="currentPassword" size="10" maxlength="255" value="#{userLoginController.currentPassword}" required="true" validatorMessage="#{msg.ERROR_USER_CURRENT_PASSWORD_MISMATCHING}">
-						<!-- <f:validator for="currentPassword" validatorId="RecruiterUserPasswordValidator" /> //-->
-					</h:inputSecret>
-				</div>
+				<div class="table_row">
+					<div class="table_left">
+						<h:outputLabel for="currentPassword" value="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRM}" />
+					</div>
 
-				<div class="clear"></div>
+					<div class="table_right">
+						<h:inputSecret styleClass="input" id="currentPassword" size="10" maxlength="255" value="#{targetController.currentPassword}" required="true" validatorMessage="#{msg.ERROR_USER_CURRENT_PASSWORD_MISMATCHING}">
+							<!-- <f:validator for="currentPassword" validatorId="RecruiterUserPasswordValidator" /> //-->
+						</h:inputSecret>
+					</div>
 
-				<h:panelGroup styleClass="error_container" layout="block">
-					<h:message for="currentPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
-				</h:panelGroup>
-			</div>
-		</fieldset>
-	</div>
+					<div class="clear"></div>
+
+					<h:panelGroup styleClass="error_container" layout="block">
+						<h:message for="currentPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+					</h:panelGroup>
+				</div>
+			</fieldset>
+		</div>
+	</ui:fragment>
 </ui:composition>
diff --git a/web/user/login_change_password.xhtml b/web/user/login_change_password.xhtml
index dc647b75..ea8d8f73 100644
--- a/web/user/login_change_password.xhtml
+++ b/web/user/login_change_password.xhtml
@@ -70,7 +70,9 @@
 							</fieldset>
 						</div>
 
-						<ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
+						<ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl">
+							<ui:param name="targetController" value="#{userPasswordController}" />
+						</ui:include>
 
 						<div class="table_footer">
 							<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
diff --git a/web/user/login_change_personal_data.xhtml b/web/user/login_change_personal_data.xhtml
index f8ec40bb..6e338d09 100644
--- a/web/user/login_change_personal_data.xhtml
+++ b/web/user/login_change_personal_data.xhtml
@@ -25,7 +25,9 @@
 				<h:form id="form_login_change_personal">
 					<ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
 
-					<ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
+					<ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl">
+						<ui:param name="targetController" value="#{userLoginController}" />
+					</ui:include>
 
 					<ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
 
-- 
2.39.5