From f6bea8386c74a297ae1a9272dc3ce671127533f7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Fri, 26 Aug 2016 11:00:28 +0200
Subject: [PATCH] Please cherry-pick: - added user last lock timestamp - fixed
 last locked reason

---
 web/admin/user/admin_user_unlock.xhtml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index d714d885..ec1edd88 100644
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -82,13 +82,25 @@
 						</div>
 					</div>
 
+					<div class="para">
+						<div class="table_data_label">
+							<h:outputLabel for="userLastLocked" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
+						</div>
+
+						<div class="table_data_field">
+							<h:outputText id="userLastLocked" value="#{beanHelper.user.userLastLocked.time}">
+								<f:convertDateTime for="userLastLocked" type="both" />
+							</h:outputText>
+						</div>
+					</div>
+
 					<div class="para">
 						<div class="table_data_label">
 							<h:outputLabel for="userLockReason" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
 						</div>
 
 						<div class="table_data_field">
-							<h:outputText id="userLockReason" value="#{adminUserController.userLockReason}" />
+							<h:outputText id="userLockReason" value="#{beanHelper.user.userLastLockedReason}" />
 						</div>
 					</div>
 
-- 
2.39.5