Skip to content

O
Openfire
Commit e39aad2b authored by Matt Tucker's avatar Matt Tucker Committed by matt
Browse files
Options

Order groups by username, improve display of users in groups. 

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@3600 b35dd754-fafc-0310-a699-88a17e54d16e
parent 38a671e8
Show whitespace changes
Inline Side-by-side
Showing with 102 additions and 14 deletions
src/java/org/jivesoftware/wildfire/group/DefaultGroupProvider.java
View file @ e39aad2b
...@@ -49,9 +49,9 @@ public class DefaultGroupProvider implements GroupProvider { ...@@ -49,9 +49,9 @@ public class DefaultGroupProvider implements GroupProvider {
"DELETE FROM jiveGroup WHERE groupName=?"; "DELETE FROM jiveGroup WHERE groupName=?";
private static final String GROUP_COUNT = "SELECT count(*) FROM jiveGroup"; private static final String GROUP_COUNT = "SELECT count(*) FROM jiveGroup";
private static final String LOAD_ADMINS = private static final String LOAD_ADMINS =
"SELECT username FROM jiveGroupUser WHERE administrator=1 AND groupName=?"; "SELECT username FROM jiveGroupUser WHERE administrator=1 AND groupName=? ORDER BY username";
private static final String LOAD_MEMBERS = private static final String LOAD_MEMBERS =
"SELECT username FROM jiveGroupUser WHERE administrator=0 AND groupName=?"; "SELECT username FROM jiveGroupUser WHERE administrator=0 AND groupName=? ORDER BY username";
private static final String LOAD_GROUP = private static final String LOAD_GROUP =
"SELECT description FROM jiveGroup WHERE groupName=?"; "SELECT description FROM jiveGroup WHERE groupName=?";
private static final String REMOVE_USER = private static final String REMOVE_USER =
......
src/web/group-edit.jsp
View file @ e39aad2b
...@@ -22,6 +22,10 @@ ...@@ -22,6 +22,10 @@
<%@ page import="java.net.URLDecoder"%> <%@ page import="java.net.URLDecoder"%>
<%@ page import="java.net.URLEncoder"%> <%@ page import="java.net.URLEncoder"%>
<%@ page import="java.util.*"%> <%@ page import="java.util.*"%>
<%@ page import="org.xmpp.packet.Presence"%>
<%@ page import="org.jivesoftware.wildfire.PresenceManager"%>
<%@ page import="org.jivesoftware.wildfire.user.User"%>
<%@ page import="org.jivesoftware.wildfire.user.UserNotFoundException"%>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %> <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
...@@ -47,6 +51,10 @@ ...@@ -47,6 +51,10 @@
String newDescription = ParamUtils.getParameter(request, "newDescription"); String newDescription = ParamUtils.getParameter(request, "newDescription");
boolean groupInfoChanged = ParamUtils.getBooleanParameter(request, "groupChanged", false); boolean groupInfoChanged = ParamUtils.getBooleanParameter(request, "groupChanged", false);
// Get the presence manager
PresenceManager presenceManager = webManager.getPresenceManager();
UserManager userManager = webManager.getUserManager();
boolean enableRosterGroups = ParamUtils.getBooleanParameter(request,"enableRosterGroups"); boolean enableRosterGroups = ParamUtils.getBooleanParameter(request,"enableRosterGroups");
String groupDisplayName = ParamUtils.getParameter(request,"groupDisplayName"); String groupDisplayName = ParamUtils.getParameter(request,"groupDisplayName");
String showGroup = ParamUtils.getParameter(request,"showGroup"); String showGroup = ParamUtils.getParameter(request,"showGroup");
...@@ -466,7 +474,7 @@ ...@@ -466,7 +474,7 @@
<input type="hidden" name="group" value="<%= groupName %>"> <input type="hidden" name="group" value="<%= groupName %>">
<table class="jive-table" cellpadding="3" cellspacing="0" border="0" width="600"> <table class="jive-table" cellpadding="3" cellspacing="0" border="0" width="600">
<tr> <tr>
<th nowrap><fmt:message key="group.edit.username" /></th> <th colspan="2" nowrap><fmt:message key="group.edit.username" /></th>
<th width="1%" nowrap><fmt:message key="group.edit.admin" /></th> <th width="1%" nowrap><fmt:message key="group.edit.admin" /></th>
<th width="1%" nowrap><fmt:message key="group.edit.remove" /></th> <th width="1%" nowrap><fmt:message key="group.edit.remove" /></th>
</tr> </tr>
...@@ -480,7 +488,7 @@ ...@@ -480,7 +488,7 @@
if (memberCount == 0) { if (memberCount == 0) {
%> %>
<tr> <tr>
<td align="center" colspan="3"> <td align="center" colspan="4">
<br> <br>
<fmt:message key="group.edit.user_hint" /> <fmt:message key="group.edit.user_hint" />
<br> <br>
...@@ -494,15 +502,55 @@ ...@@ -494,15 +502,55 @@
boolean showUpdateButtons = memberCount > 0; boolean showUpdateButtons = memberCount > 0;
boolean showRemoteJIDsWarning = false; boolean showRemoteJIDsWarning = false;
while (admins.hasNext()) { while (admins.hasNext()) {
JID user = (JID)admins.next(); JID jid = (JID)admins.next();
boolean isLocal = webManager.getXMPPServer().isLocal(jid);
User user = null;
if (isLocal) {
try {
user = userManager.getUser(jid.getNode());
}
catch (UserNotFoundException unfe) {
// Ignore.
}
}
%> %>
<tr> <tr>
<td><%= user %><% if (!webManager.getXMPPServer().isLocal(user)) { showRemoteJIDsWarning = true; %> <font color="red"><b>*</b></font><%}%></td> <td width="1%">
<% if (user != null && presenceManager.isAvailable(user)) {
Presence presence = presenceManager.getPresence(user);
%>
<% if (presence.getShow() == null) { %>
<img src="images/user-green-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="user.properties.available" />">
<% } %>
<% if (presence.getShow() == Presence.Show.chat) { %>
<img src="images/user-green-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.chat_available" />">
<% } %>
<% if (presence.getShow() == Presence.Show.away) { %>
<img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.away" />">
<% } %>
<% if (presence.getShow() == Presence.Show.xa) { %>
<img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.extended" />">
<% } %>
<% if (presence.getShow() == Presence.Show.dnd) { %>
<img src="images/user-red-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.not_disturb" />">
<% } %>
<% } else { %>
<img src="images/user-clear-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="user.properties.offline" />">
<% } %>
</td>
<% if (user != null) { %>
<td><a href="user-properties.jsp?username=<%= URLEncoder.encode(user.getUsername(), "UTF-8") %>"><%= user.getUsername() %></a><% if (!isLocal) { showRemoteJIDsWarning = true; %> <font color="red"><b>*</b></font><%}%></td>
<% } else { %>
<td><%= jid %><% showRemoteJIDsWarning = true; %> <font color="red"><b>*</b></font></td>
<% } %>
<td align="center"> <td align="center">
<input type="checkbox" name="admin" value="<%= user %>" checked> <input type="checkbox" name="admin" value="<%= jid %>" checked>
</td> </td>
<td align="center"> <td align="center">
<input type="checkbox" name="delete" value="<%= user %>"> <input type="checkbox" name="delete" value="<%= jid %>">
</td> </td>
</tr> </tr>
<% <%
...@@ -510,15 +558,55 @@ ...@@ -510,15 +558,55 @@
%> %>
<% <%
while (members.hasNext()) { while (members.hasNext()) {
JID user = (JID)members.next(); JID jid = (JID)members.next();
boolean isLocal = webManager.getXMPPServer().isLocal(jid);
User user = null;
if (isLocal) {
try {
user = userManager.getUser(jid.getNode());
}
catch (UserNotFoundException unfe) {
// Ignore.
}
}
%> %>
<tr> <tr>
<td><%= user %><% if (!webManager.getXMPPServer().isLocal(user)) { showRemoteJIDsWarning = true; %> <font color="red"><b>*</b></font><%}%></td> <td width="1%">
<% if (user != null && presenceManager.isAvailable(user)) {
Presence presence = presenceManager.getPresence(user);
%>
<% if (presence.getShow() == null) { %>
<img src="images/user-green-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="user.properties.available" />">
<% } %>
<% if (presence.getShow() == Presence.Show.chat) { %>
<img src="images/user-green-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.chat_available" />">
<% } %>
<% if (presence.getShow() == Presence.Show.away) { %>
<img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.away" />">
<% } %>
<% if (presence.getShow() == Presence.Show.xa) { %>
<img src="images/user-yellow-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.extended" />">
<% } %>
<% if (presence.getShow() == Presence.Show.dnd) { %>
<img src="images/user-red-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="session.details.not_disturb" />">
<% } %>
<% } else { %>
<img src="images/user-clear-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="user.properties.offline" />">
<% } %>
</td>
<% if (user != null) { %>
<td><a href="user-properties.jsp?username=<%= URLEncoder.encode(user.getUsername(), "UTF-8") %>"><%= user.getUsername() %></a><% if (!isLocal) { showRemoteJIDsWarning = true; %> <font color="red"><b>*</b></font><%}%></td>
<% } else { %>
<td><%= jid %><% showRemoteJIDsWarning = true; %> <font color="red"><b>*</b></font></td>
<% } %>
<td align="center"> <td align="center">
<input type="checkbox" name="admin" value="<%= user %>"> <input type="checkbox" name="admin" value="<%= jid %>">
</td> </td>
<td align="center"> <td align="center">
<input type="checkbox" name="delete" value="<%= user %>"> <input type="checkbox" name="delete" value="<%= jid %>">
</td> </td>
</tr> </tr>
<% <%
...@@ -528,7 +616,7 @@ ...@@ -528,7 +616,7 @@
if (showUpdateButtons) { if (showUpdateButtons) {
%> %>
<tr> <tr>
<td> <td colspan="2">
&nbsp; &nbsp;
</td> </td>
<td align="center"> <td align="center">
...@@ -544,7 +632,7 @@ ...@@ -544,7 +632,7 @@
if (showRemoteJIDsWarning) { if (showRemoteJIDsWarning) {
%> %>
<tr> <tr>
<td colspan="3"> <td colspan="4">
<font color="red">* <fmt:message key="group.edit.note" /></font> <font color="red">* <fmt:message key="group.edit.note" /></font>
</td> </td>
</tr> </tr>
......
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

Technounit-GROUP 2023