opendev/gerrit
Code Issues Proposed changes

Enable UI action to toggle WIP flag for admins

Browse Source 
Change I4878f066b6 allowed administrators to toggle the WIP flag on any
change but the UI action was still disabled for admins.

Change-Id: I55dd6400dc07d57fe2aaaf3528ff429d5baf48ed
Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
Edwin Kempin 2018-03-27 15:20:58 +02:00
parent 659ea71969
commit 9cae606cda
2 changed files with 20 additions and 6 deletions
java/com/google/gerrit/server/restapi/change
SetReadyForReview.javaSetWorkInProgress.java

13
java/com/google/gerrit/server/restapi/change/SetReadyForReview.java

@ -14,6 +14,9 @@
package com.google.gerrit.server.restapi.change; package com.google.gerrit.server.restapi.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.common.TimeUtil;
import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.ResourceConflictException; import com.google.gerrit.extensions.restapi.ResourceConflictException;
@ -93,8 +96,12 @@ public class SetReadyForReview extends RetryingRestModifyView<ChangeResource, In
.setLabel("Start Review") .setLabel("Start Review")
.setTitle("Set Ready For Review") .setTitle("Set Ready For Review")
.setVisible( .setVisible(
rsrc.isUserOwner() and(
&& rsrc.getChange().getStatus() == Status.NEW rsrc.getChange().getStatus() == Status.NEW && rsrc.getChange().isWorkInProgress(),
&& rsrc.getChange().isWorkInProgress()); or(
rsrc.isUserOwner(),
permissionBackend
.currentUser()
.testCond(GlobalPermission.ADMINISTRATE_SERVER))));
} }
} }

13
java/com/google/gerrit/server/restapi/change/SetWorkInProgress.java

@ -14,6 +14,9 @@
package com.google.gerrit.server.restapi.change; package com.google.gerrit.server.restapi.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.common.TimeUtil;
import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.ResourceConflictException; import com.google.gerrit.extensions.restapi.ResourceConflictException;
@ -94,8 +97,12 @@ public class SetWorkInProgress extends RetryingRestModifyView<ChangeResource, In
.setLabel("WIP") .setLabel("WIP")
.setTitle("Set Work In Progress") .setTitle("Set Work In Progress")
.setVisible( .setVisible(
rsrc.isUserOwner() and(
&& rsrc.getChange().getStatus() == Status.NEW rsrc.getChange().getStatus() == Status.NEW && !rsrc.getChange().isWorkInProgress(),
&& !rsrc.getChange().isWorkInProgress()); or(
rsrc.isUserOwner(),
permissionBackend
.currentUser()
.testCond(GlobalPermission.ADMINISTRATE_SERVER))));
} }
} }