opendev/gerrit
Code Issues Proposed changes

Merge "Support managing visible external groups within internal groups"

Browse Source
This commit is contained in:
Shawn Pearce
2013-02-08 18:56:10 +00:00
committed by Gerrit Code Review
parent 44bec913ee 3e4009b9f4
commit ed8535a7a5
6 changed files with 64 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gerrit-server/src/main/java/com/google/gerrit/server/account/GroupControl.java
View File

@@ -67,7 +67,7 @@ public class GroupControl {
if (group == null) {
throw new NoSuchGroupException(groupId);
}
return new GroupControl(user.get(), group);
return controlFor(GroupDescriptions.forAccountGroup(group));
}
public GroupControl controlFor(final AccountGroup.UUID groupId)
@@ -76,10 +76,14 @@ public class GroupControl {
if (group == null) {
throw new NoSuchGroupException(groupId);
}
return new GroupControl(user.get(), group);
return controlFor(group);
}
public GroupControl controlFor(final AccountGroup group) {
public GroupControl controlFor(AccountGroup group) {
return controlFor(GroupDescriptions.forAccountGroup(group));
}
public GroupControl controlFor(GroupDescription.Basic group) {
return new GroupControl(user.get(), group);
}
@@ -111,10 +115,6 @@ public class GroupControl {
group = gd;
}
GroupControl(CurrentUser who, AccountGroup ag) {
this(who, GroupDescriptions.forAccountGroup(ag));
}
public GroupDescription.Basic getGroup() {
return group;
}