diff options
| author | David Pursehouse <dpursehouse@collab.net> | 2018-03-27 16:06:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-27 16:06:15 +0000 |
| commit | 6c662384a6bf34aabe9a0036ba17aec82a489137 (patch) | |
| tree | f3e283688938eb2cd2c50c082dffa313ccf80bd5 | |
| parent | ab29831c57bd4af056a8fb0c4f6a1d073c449e36 (diff) | |
| parent | 2eb2c8b4a772f9a4b7789813801629e83b04f183 (diff) | |
Merge "Enable UI action to toggle WIP flag for admins" into stable-2.15
| -rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/change/SetReadyForReview.java | 11 | ||||
| -rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/change/SetWorkInProgress.java | 11 |
2 files changed, 16 insertions, 6 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/SetReadyForReview.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/SetReadyForReview.java index 3c833761b3..89ac0a9b1e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/SetReadyForReview.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/SetReadyForReview.java @@ -14,6 +14,9 @@ package com.google.gerrit.server.change; +import static com.google.gerrit.extensions.conditions.BooleanCondition.and; +import static com.google.gerrit.extensions.conditions.BooleanCondition.or; + import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.ResourceConflictException; @@ -91,8 +94,10 @@ public class SetReadyForReview extends RetryingRestModifyView<ChangeResource, In .setLabel("Start Review") .setTitle("Set Ready For Review") .setVisible( - rsrc.isUserOwner() - && rsrc.getChange().getStatus() == Status.NEW - && rsrc.getChange().isWorkInProgress()); + and( + rsrc.getChange().getStatus() == Status.NEW && rsrc.getChange().isWorkInProgress(), + or( + rsrc.isUserOwner(), + permissionBackend.user(self).testCond(GlobalPermission.ADMINISTRATE_SERVER)))); } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/SetWorkInProgress.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/SetWorkInProgress.java index 5dcb602597..1129e50580 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/SetWorkInProgress.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/SetWorkInProgress.java @@ -14,6 +14,9 @@ package com.google.gerrit.server.change; +import static com.google.gerrit.extensions.conditions.BooleanCondition.and; +import static com.google.gerrit.extensions.conditions.BooleanCondition.or; + import com.google.gerrit.common.TimeUtil; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.ResourceConflictException; @@ -91,8 +94,10 @@ public class SetWorkInProgress extends RetryingRestModifyView<ChangeResource, In .setLabel("WIP") .setTitle("Set Work In Progress") .setVisible( - rsrc.isUserOwner() - && rsrc.getChange().getStatus() == Status.NEW - && !rsrc.getChange().isWorkInProgress()); + and( + rsrc.getChange().getStatus() == Status.NEW && !rsrc.getChange().isWorkInProgress(), + or( + rsrc.isUserOwner(), + permissionBackend.user(self).testCond(GlobalPermission.ADMINISTRATE_SERVER)))); } } |