opendev/gerrit
Code Issues Proposed changes

Merge branch 'sec-access-panel'

Browse Source
This commit is contained in:
Shawn O. Pearce
2010-11-08 17:10:20 -08:00
parent cd67a8403f ee5320abd7
commit fc26d13c45
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectDetailFactory.java
View File

@@ -26,6 +26,7 @@ import com.google.gerrit.server.account.GroupCache;
import com.google.gerrit.server.project.NoSuchProjectException;
import com.google.gerrit.server.project.ProjectControl;
import com.google.gerrit.server.project.ProjectState;
import com.google.gerrit.server.project.RefControl;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;
@@ -75,8 +76,14 @@ class ProjectDetailFactory extends Handler<ProjectDetail> {
final List<InheritedRefRight> refRights = new ArrayList<InheritedRefRight>();
for (final RefRight r : projectState.getInheritedRights()) {
InheritedRefRight refRight = new InheritedRefRight(
r, true, pc.controlForRef(r.getRefPattern()).isOwner());
RefControl rc = pc.controlForRef(r.getRefPattern());
boolean isOwner = rc.isOwner();
if (!isOwner && !rc.isVisible()) {
continue;
}
InheritedRefRight refRight = new InheritedRefRight(r, true, isOwner);
if (!refRights.contains(refRight)) {
refRights.add(refRight);
wantGroup(r.getAccountGroupId());
@@ -84,8 +91,14 @@ class ProjectDetailFactory extends Handler<ProjectDetail> {
}
for (final RefRight r : projectState.getLocalRights()) {
refRights.add(new InheritedRefRight(
r, false, pc.controlForRef(r.getRefPattern()).isOwner()));
RefControl rc = pc.controlForRef(r.getRefPattern());
boolean isOwner = rc.isOwner();
if (!isOwner && !rc.isVisible()) {
continue;
}
refRights.add(new InheritedRefRight(r, false, isOwner));
wantGroup(r.getAccountGroupId());
}