opendev/gerrit
Code Issues Proposed changes

Merge "Remove isVisibleToAll from GroupDescription"

Browse Source
This commit is contained in:
Shawn Pearce
2013-02-08 15:11:17 +00:00
committed by Gerrit Code Review
parent d4f37536de b39b746f40
commit 54909a0242
5 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-common/src/main/java/com/google/gerrit/common/data/GroupDescription.java
View File

@@ -32,9 +32,6 @@ public class GroupDescription {
/** @return the non-null name of the group. */ /** @return the non-null name of the group. */
String getName(); String getName();
/** @return whether the group is visible to all accounts. */
boolean isVisibleToAll();
/** /**
* @return optional email address to send to the group's members. If * @return optional email address to send to the group's members. If
* provided, Gerrit will use this email address to send * provided, Gerrit will use this email address to send

5
gerrit-common/src/main/java/com/google/gerrit/common/data/GroupDescriptions.java
View File

@@ -44,11 +44,6 @@ public class GroupDescriptions {
return group.getName(); return group.getName();
} }
@Override
public boolean isVisibleToAll() {
return group.isVisibleToAll();
}
@Override @Override
public AccountGroup getAccountGroup() { public AccountGroup getAccountGroup() {
return group; return group;

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

@@ -103,7 +103,8 @@ public class GroupControl {
/** Can this user see this group exists? */ /** Can this user see this group exists? */
public boolean isVisible() { public boolean isVisible() {
return group.isVisibleToAll() AccountGroup accountGroup = GroupDescriptions.toAccountGroup(group);
return (accountGroup != null && accountGroup.isVisibleToAll())
|| user.getEffectiveGroups().contains(group.getGroupUUID()) || user.getEffectiveGroups().contains(group.getGroupUUID())
|| isOwner(); || isOwner();
} }
@@ -149,6 +150,8 @@ public class GroupControl {
} }
private boolean canSeeMembers() { private boolean canSeeMembers() {
return group.isVisibleToAll() || isOwner(); AccountGroup accountGroup = GroupDescriptions.toAccountGroup(group);
return (accountGroup != null && accountGroup.isVisibleToAll())
|| isOwner();
} }
} }

5
gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapGroupBackend.java
View File

@@ -149,11 +149,6 @@ public class LdapGroupBackend implements GroupBackend {
return name; return name;
} }
@Override
public boolean isVisibleToAll() {
return false;
}
@Override @Override
@Nullable @Nullable
public String getEmailAddress() { public String getEmailAddress() {

4
gerrit-server/src/main/java/com/google/gerrit/server/group/GroupOptionsInfo.java
View File

@@ -15,6 +15,7 @@
package com.google.gerrit.server.group; package com.google.gerrit.server.group;
import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.common.data.GroupDescription;
import com.google.gerrit.common.data.GroupDescriptions;
import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.reviewdb.client.AccountGroup;
public class GroupOptionsInfo { public class GroupOptionsInfo {
@@ -22,7 +23,8 @@ public class GroupOptionsInfo {
public Boolean visibleToAll; public Boolean visibleToAll;
public GroupOptionsInfo(GroupDescription.Basic group) { public GroupOptionsInfo(GroupDescription.Basic group) {
visibleToAll = group.isVisibleToAll() ? true : null; AccountGroup ag = GroupDescriptions.toAccountGroup(group);
visibleToAll = ag != null && ag.isVisibleToAll() ? true : null;
} }
public GroupOptionsInfo(AccountGroup group) { public GroupOptionsInfo(AccountGroup group) {