Added dialog for adding TPS groups.

A new dialog box has been added for adding TPS groups. A separate
group ID attribute has been added to the REST service as required
by Backbone.

Ticket #654

1 files changed, 8 insertions, 5 deletions

diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/GroupService.java b/base/server/cms/src/com/netscape/cms/servlet/admin/GroupService.java
index a20b548ad..722979d79 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/admin/GroupService.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/admin/GroupService.java
@@ -79,14 +79,17 @@ public class GroupService extends PKIService implements GroupResource {
 
         GroupData groupData = new GroupData();
 
-        String id = group.getGroupID();
-        if (!StringUtils.isEmpty(id)) groupData.setID(id);
+        String groupID = group.getGroupID();
+        if (!StringUtils.isEmpty(groupID)) {
+            groupData.setID(groupID);
+            groupData.setGroupID(groupID);
+        }
 
         String description = group.getDescription();
         if (!StringUtils.isEmpty(description)) groupData.setDescription(description);
 
-        String groupID = URLEncoder.encode(groupData.getID(), "UTF-8");
-        URI uri = uriInfo.getBaseUriBuilder().path(GroupResource.class).path("{groupID}").build(groupID);
+        String encodedGroupID = URLEncoder.encode(groupData.getID(), "UTF-8");
+        URI uri = uriInfo.getBaseUriBuilder().path(GroupResource.class).path("{groupID}").build(encodedGroupID);
         groupData.setLink(new Link("self", uri));
 
         return groupData;
@@ -190,7 +193,7 @@ public class GroupService extends PKIService implements GroupResource {
 
         if (groupData == null) throw new BadRequestException("Group data is null.");
 
-        String groupID = groupData.getID();
+        String groupID = groupData.getGroupID();
 
         // ensure that any low-level exceptions are reported
         // to the signed audit log and stored as failures