Commit 24c27352 authored by Guus der Kinderen's avatar Guus der Kinderen Committed by daryl herzmann

OF-200: On users admin page, distinguish between unused and online users. (#919)

On the user overview page on the admin console, the column 'last logged out' now either displays
'online' or 'never logged in before', instead of being empty.
parent 2715f809
...@@ -2552,6 +2552,7 @@ user.properties.locksuccess=User locked out successfully. ...@@ -2552,6 +2552,7 @@ user.properties.locksuccess=User locked out successfully.
user.properties.unlocksuccess=User unlocked successfully. user.properties.unlocksuccess=User unlocked successfully.
user.properties.isadmin=User has administrative privileges. user.properties.isadmin=User has administrative privileges.
user.properties.additional_properties=Additional Properties user.properties.additional_properties=Additional Properties
user.properties.never_logged_in=Never logged in before.
# User roster Page # User roster Page
......
...@@ -1717,6 +1717,7 @@ user.properties.locked=This account is currently locked out. ...@@ -1717,6 +1717,7 @@ user.properties.locked=This account is currently locked out.
user.properties.locked_set=This account has a lockout scheduled. user.properties.locked_set=This account has a lockout scheduled.
user.properties.locksuccess=User locked out successfully. user.properties.locksuccess=User locked out successfully.
user.properties.unlocksuccess=User unlocked successfully. user.properties.unlocksuccess=User unlocked successfully.
user.properties.never_logged_in=Nog nooit ingelogd
# User search Page # User search Page
......
...@@ -261,13 +261,16 @@ ...@@ -261,13 +261,16 @@
<%= user.getCreationDate() != null ? JiveGlobals.formatDate(user.getCreationDate()) : "&nbsp;" %> <%= user.getCreationDate() != null ? JiveGlobals.formatDate(user.getCreationDate()) : "&nbsp;" %>
</td> </td>
<td width="23%"> <td width="23%">
<% long logoutTime = presenceManager.getLastActivity(user); <% if (presenceManager.isAvailable(user)) { %>
<fmt:message key="session.details.online" />
<% } else {
long logoutTime = presenceManager.getLastActivity(user);
if (logoutTime > -1) { if (logoutTime > -1) {
out.println(StringUtils.getElapsedTime(logoutTime)); out.println(StringUtils.getElapsedTime(logoutTime));
} } else { %>
else { <fmt:message key="user.properties.never_logged_in" />
out.println("&nbsp;"); <% }
} %> }%>
</td> </td>
<% // Don't allow editing or deleting if users are read-only. <% // Don't allow editing or deleting if users are read-only.
if (!UserManager.getUserProvider().isReadOnly()) { %> if (!UserManager.getUserProvider().isReadOnly()) { %>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment