From: Roland Häder <roland@mxchange.org>
Date: Fri, 26 Aug 2016 09:00:28 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f6bea8386c74a297ae1a9272dc3ce671127533f7;p=jjobs-war.git

Please cherry-pick:
- added user last lock timestamp
- fixed last locked reason
---

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>