Skip to content

O
Openfire
Commit d2b40a9c authored by Derek DeMoro's avatar Derek DeMoro Committed by derek
Browse files
Options

Adding new Group Edit Page and added new "Add user" during Group create. 


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@803 b35dd754-fafc-0310-a699-88a17e54d16e
parent a26f4017
Expand all Show whitespace changes
Inline Side-by-side
Showing with 333 additions and 337 deletions
src/resources/jar/admin-sidebar.xml
View file @ d2b40a9c
...@@ -99,6 +99,10 @@ ...@@ -99,6 +99,10 @@
url="group-properties.jsp" url="group-properties.jsp"
description="Click to edit the groups's properties" /> description="Click to edit the groups's properties" />
<item id="group-edit" name="Edit Group"
url="group-edit-form.jsp"
description="Click to edit the group" />
<item id="group-delete" name="Delete Group" <item id="group-delete" name="Delete Group"
url="group-delete.jsp" url="group-delete.jsp"
description="Click to delete the group" /> description="Click to delete the group" />
......
src/web/group-create.jsp
View file @ d2b40a9c
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
- This software is published under the terms of the GNU Public License (GPL), - This software is published under the terms of the GNU Public License (GPL),
- a copy of which is included in this distribution. - a copy of which is included in this distribution.
--%> --%>
<%@ page
<%@ page import="org.jivesoftware.util.*, import ="org.jivesoftware.util.*,
java.util.HashMap, java.util.HashMap,
java.util.Map, java.util.Map,
java.util.*, java.util.*,
...@@ -23,34 +23,30 @@ ...@@ -23,34 +23,30 @@
org.dom4j.xpath.DefaultXPath, org.dom4j.xpath.DefaultXPath,
org.dom4j.*, org.dom4j.*,
org.jivesoftware.messenger.group.*" org.jivesoftware.messenger.group.*"
errorPage="error.jsp" errorPage="error.jsp"%>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"/>
<jsp:useBean id="errors" class="java.util.HashMap"/>
<%
webManager.init(request, response, session, application, out);
%> %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
<jsp:useBean id="errors" class="java.util.HashMap" />
<% webManager.init(request, response, session, application, out ); %>
<% // Get parameters // <% // Get parameters //
boolean create = request.getParameter("create") != null; boolean create = request.getParameter("create") != null;
boolean cancel = request.getParameter("cancel") != null; boolean cancel = request.getParameter("cancel") != null;
String name = ParamUtils.getParameter(request,"name"); String name = ParamUtils.getParameter(request, "name");
String description = ParamUtils.getParameter(request,"description"); String description = ParamUtils.getParameter(request, "description");
String users = ParamUtils.getParameter(request, "users");
// Handle a cancel // Handle a cancel
if (cancel) { if (cancel) {
response.sendRedirect("group-summary.jsp"); response.sendRedirect("group-summary.jsp");
return; return;
} }
// Handle a request to create a group: // Handle a request to create a group:
if (create) { if (create) {
// Validate // Validate
if (name == null) { if (name == null) {
errors.put("name",""); errors.put("name", "");
} }
// do a create if there were no errors // do a create if there were no errors
if (errors.size() == 0) { if (errors.size() == 0) {
try { try {
...@@ -58,25 +54,33 @@ ...@@ -58,25 +54,33 @@
if (description != null) { if (description != null) {
newGroup.setDescription(description); newGroup.setDescription(description);
} }
String hostName = webManager.getXMPPServer().getServerInfo().getName();
StringTokenizer tokenizer = new StringTokenizer(users, ",");
while (tokenizer.hasMoreTokens()) {
String tok = tokenizer.nextToken();
String address = tok;
if (address.indexOf("@") == -1) {
address = address + "@" + hostName;
}
newGroup.getMembers().add(address);
}
// Successful, so redirect // Successful, so redirect
response.sendRedirect("group-properties.jsp?success=true&group=" + newGroup.getName()); response.sendRedirect("group-properties.jsp?success=true&group=" + newGroup.getName());
return; return;
} }
catch (GroupAlreadyExistsException e) { catch (GroupAlreadyExistsException e) {
e.printStackTrace(); e.printStackTrace();
errors.put("groupAlreadyExists",""); errors.put("groupAlreadyExists", "");
} }
catch (Exception e) { catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
errors.put("general",""); errors.put("general", "");
Log.error(e); Log.error(e);
} }
} }
} }
%> %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean"/>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Create Group"; String title = "Create Group";
pageinfo.setTitle(title); pageinfo.setTitle(title);
...@@ -84,56 +88,61 @@ ...@@ -84,56 +88,61 @@
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "group-create.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "group-create.jsp"));
pageinfo.setPageID("group-create"); pageinfo.setPageID("group-create");
%> %>
<jsp:include page="top.jsp" flush="true" /> <jsp:include page="top.jsp" flush="true"/>
<jsp:include page="title.jsp" flush="true" /> <jsp:include page="title.jsp" flush="true"/>
<c:set var="submit" value="${param.create}"/>
<c:set var="submit" value="${param.create}" /> <c:set var="errors" value="${errors}"/>
<c:set var="errors" value="${errors}" /> <%
if (errors.get("general") != null) {
<% if (errors.get("general") != null) { %> %>
<div class="jive-success"> <div class="jive-success">
<table cellpadding="0" cellspacing="0" border="0"> <table cellpadding="0" cellspacing="0" border="0">
<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">
Error creating the group. Please check your error logs. Error creating the group. Please check your error logs.
</td></tr> </td>
</tr>
</tbody> </tbody>
</table> </table>
</div><br> </div>
<br>
<% } %> <%
}
<p>Use the form below to create a new group.</p> %>
<p>
<form name="f" action="group-create.jsp" method="post"> Use the form below to create a new group.</p>
<form name="f" action="group-create.jsp" method="post">
<fieldset> <fieldset>
<legend>Create New Group</legend> <legend>
Create New Group
</legend>
<div> <div>
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0" width="100%">
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap> <td width="1%" nowrap>
<label for="gname">Group Name:</label> * <label for="gname">Group Name:</label>
*
</td> </td>
<td width="99%"> <td width="99%">
<input type="text" name="name" size="30" maxlength="75" value="<%= ((name!=null) ? name : "") %>" <input type="text" name="name" size="30" maxlength="75"
id="gname"> value="<%= ((name != null) ? name : "") %>" id="gname">
<%
<% if (errors.get("name") != null) { %> if (errors.get("name") != null) {
%>
<span class="jive-error-text"> <span class="jive-error-text"> Invalid name. </span>
Invalid name. <%
</span> }
else if (errors.get("groupAlreadyExists") != null) {
<% } else if (errors.get("groupAlreadyExists") != null) { %> %>
<span class="jive-error-text"> Group already exists - please choose a different
<span class="jive-error-text"> name. </span>
Group already exists - please choose a different name. <%
</span> }
%>
<% } %>
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
...@@ -141,39 +150,43 @@ ...@@ -141,39 +150,43 @@
<label for="gdesc">Description:</label> <label for="gdesc">Description:</label>
</td> </td>
<td width="99%"> <td width="99%">
<textarea name="description" cols="30" rows="5" id="gdesc" <textarea name="description" cols="30" rows="5" id="gdesc"><%= ((description != null) ? description : "") %></textarea>
><%= ((description!=null) ? description : "") %></textarea> <%
if (errors.get("description") != null) {
<% if (errors.get("description") != null) { %> %>
<span class="jive-error-text"> Invalid description. </span>
<span class="jive-error-text"> <%
Invalid description. }
</span> %>
</td>
<% } %> </tr>
<tr>
<td nowrap width="1%">
Add User(s):
</td>
<td nowrap class="c1" align="left">
<input type="text" size="40" name="users"/>
&nbsp;
</td>
</tr>
<td width="1%">
</td>
<td nowrap align="left" class="jive-description">
Comma delimited list. Example: "user1@site.com", "user2@site.com"
</td> </td>
</tr> </tr>
</table> </table>
<br> <br>
<span class="jive-description"> <span class="jive-description"> * Required fields </span>
* Required fields
</span>
</div> </div>
</fieldset> </fieldset>
<br>
<br><br> <br>
<input type="submit" name="create" value="Create Group"> <input type="submit" name="cancel" value="Cancel">
<input type="submit" name="create" value="Create Group"> </form>
<input type="submit" name="cancel" value="Cancel"> <script language="JavaScript" type="text/javascript">
document.f.name.focus();
</form> function checkFields() {
}
<script language="JavaScript" type="text/javascript"> </script>
document.f.name.focus(); <jsp:include page="bottom.jsp" flush="true"/>
function checkFields() {
}
</script>
<jsp:include page="bottom.jsp" flush="true" />
src/web/group-edit-form.jsp
View file @ d2b40a9c
This diff is collapsed.
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