Commit 5d9825fc authored by Matt Tucker's avatar Matt Tucker Committed by matt

More group work.


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@536 b35dd754-fafc-0310-a699-88a17e54d16e
parent c5fae6ed
...@@ -57,7 +57,7 @@ public class DbGroupProvider implements GroupProvider { ...@@ -57,7 +57,7 @@ public class DbGroupProvider implements GroupProvider {
"INSERT INTO jiveGroupUser (groupName, username, administrator) VALUES (?, ?, ?)"; "INSERT INTO jiveGroupUser (groupName, username, administrator) VALUES (?, ?, ?)";
private static final String USER_GROUPS = private static final String USER_GROUPS =
"SELECT groupName FROM jiveGroupUser WHERE username=?"; "SELECT groupName FROM jiveGroupUser WHERE username=?";
private static final String ALL_GROUPS = "SELECT name FROM jiveGroup"; private static final String ALL_GROUPS = "SELECT name FROM jiveGroup ORDER BY name";
public Group createGroup(String name) throws GroupAlreadyExistsException { public Group createGroup(String name) throws GroupAlreadyExistsException {
Connection con = null; Connection con = null;
......
...@@ -92,7 +92,7 @@ Below is a summary of the group. To edit properties, click the "Edit" button bel ...@@ -92,7 +92,7 @@ Below is a summary of the group. To edit properties, click the "Edit" button bel
<tbody> <tbody>
<tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td> <tr><td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
<td class="jive-icon-label"> <td class="jive-icon-label">
Group properties updated successfully. Group updated successfully.
</td></tr> </td></tr>
</tbody> </tbody>
</table> </table>
......
...@@ -130,15 +130,17 @@ Sorted by Group Name ...@@ -130,15 +130,17 @@ Sorted by Group Name
</td> </td>
<td width="60%"> <td width="60%">
<a href="group-properties.jsp?group=<%= group.getName() %>"><%= group.getName() %></a> <a href="group-properties.jsp?group=<%= group.getName() %>"><%= group.getName() %></a>
<% if (group.getDescription() != null) { %>
<br> <br>
<span class="jive-description"> <span class="jive-description">
<%= group.getDescription() %> <%= group.getDescription() %>
</span> </span>
<% } %>
</td> </td>
<td width="10%"> <td width="10%" align="center">
<%= group.getMembers().size() %> <%= group.getMembers().size() %>
</td> </td>
<td width="10%"> <td width="10%" align="center">
<%= group.getAdministrators().size() %> <%= group.getAdministrators().size() %>
</td> </td>
<td width="1%" align="center"> <td width="1%" align="center">
......
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