opendev/gerrit
Code Issues Proposed changes

Merge "Allow InternalUsers to see drafts" into stable-2.11

Browse Source
This commit is contained in:
Edwin Kempin 2015-10-09 13:03:45 +00:00 committed by Gerrit Code Review
commit 70dbef29df
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-server/src/main/java/com/google/gerrit/server/CurrentUser.java
View File

@ -100,4 +100,9 @@ public abstract class CurrentUser {
public boolean isIdentifiedUser() {
return false;
}
/** Check if the CurrentUser is an InternalUser. */
public boolean isInternalUser() {
return false;
}
}

5
gerrit-server/src/main/java/com/google/gerrit/server/InternalUser.java
View File

@ -61,6 +61,11 @@ public class InternalUser extends CurrentUser {
return Collections.emptySet();
}
@Override
public boolean isInternalUser() {
return true;
}
@Override
public String toString() {
return "InternalUser";

4
gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java
View File

@ -28,6 +28,7 @@ import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.InternalUser;
import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.gwtorm.server.OrmException;
@ -352,6 +353,7 @@ public class ChangeControl {
public boolean isDraftVisible(ReviewDb db, ChangeData cd)
throws OrmException {
return isOwner() || isReviewer(db, cd) || getRefControl().canViewDrafts();
return isOwner() || isReviewer(db, cd) || getRefControl().canViewDrafts()
|| getCurrentUser().isInternalUser();
}
}