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 d714d8856b5745e264d66342e1a021edcae33a3d..ec1edd8810ed3c785c963191e68f7358fcdc622c 100644 (file)
--- 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>