Merge pull request #1100 from chandrikamohith/MIFOSX-1480

MIFOSX-1480 Group member changes
2014-10-07 20:14:09 -07:00
parent 5841e8f957 872843a327
commit d1039c1929
1 changed files with 2 additions and 1 deletions
@@ -537,13 +537,14 @@ public final class Group extends AbstractPersistable<Long> {
                        group.getId());
            }

+            if (hasGroupAsMember(group)) { throw new GroupExistsInCenterException(getId(), group.getId()); }
+
            if (group.isChildGroup()) {
                final String defaultUserMessage = "Group is already associated with a center";
                throw new GeneralPlatformDomainRuleException("error.msg.group.already.associated.with.center", defaultUserMessage, group
                        .getParent().getId(), group.getId());
            }

-            if (hasGroupAsMember(group)) { throw new GroupExistsInCenterException(getId(), group.getId()); }

            this.groupMembers.add(group);
            differences.add(group.getId().toString());