From 04f1cc0b5351b6d39dc43cd574d92359573c9ea2 Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Tue, 06 Aug 2013 15:39:09 +0000
Subject: [PATCH] CR-2124 Fix OPENDJ-1016 Control panel does not follow static group recommendation from documentation

---
 opends/src/guitools/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java
index 38065f7..f5efaba 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java
@@ -23,6 +23,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
+ *      Portions Copyright 2013 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -63,6 +64,7 @@
 import org.opends.messages.Message;
 import org.opends.server.types.DN;
 import org.opends.server.types.OpenDsException;
+import org.opends.server.util.ServerConstants;
 
 /**
  * The dialog that is displayed when we want to add entries to a set of groups.
@@ -388,7 +390,9 @@
             errors.add(
                 ERR_CTRL_PANEL_GROUP_COULD_NOT_BE_FOUND.get(groupDn));
           }
-          else if (!hasObjectClass(groupDn, "groupOfUniqueNames"))
+          else if (!hasObjectClass(groupDn, ServerConstants.OC_GROUP_OF_NAMES,
+            ServerConstants.OC_GROUP_OF_ENTRIES,
+            ServerConstants.OC_GROUP_OF_UNIQUE_NAMES))
           {
             errors.add(ERR_CTRL_PANEL_NOT_A_STATIC_GROUP.get(groupDn));
           }

--
Gitblit v1.10.0