opendev/gerrit
Code Issues Proposed changes

DeletePrivateByPost: Use BooleanCondition for #setVisible

Browse Source 
Change-Id: Id371c83907418369179d52fc27d1524dd8a44995
This commit is contained in:
Patrick Hiesel
2017-08-16 18:18:14 +02:00
parent e1a664869c
commit 3d958b3aac
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gerrit-server/src/main/java/com/google/gerrit/server/change/DeletePrivate.java
View File

@@ -14,7 +14,10 @@
package com.google.gerrit.server.change;
import static com.google.gerrit.extensions.conditions.BooleanCondition.or;
import com.google.gerrit.common.TimeUtil;
import com.google.gerrit.extensions.conditions.BooleanCondition;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
import com.google.gerrit.extensions.restapi.Response;
@@ -56,7 +59,7 @@ public class DeletePrivate
protected Response<String> applyImpl(
BatchUpdate.Factory updateFactory, ChangeResource rsrc, SetPrivateOp.Input input)
throws RestApiException, UpdateException {
if (!canDeletePrivate(rsrc)) {
if (!canDeletePrivate(rsrc).value()) {
throw new AuthException("not allowed to unmark private");
}
@@ -78,9 +81,10 @@ public class DeletePrivate
return Response.none();
}
protected boolean canDeletePrivate(ChangeResource rsrc) {
protected BooleanCondition canDeletePrivate(ChangeResource rsrc) {
PermissionBackend.WithUser user = permissionBackend.user(rsrc.getUser());
return user.testOrFalse(GlobalPermission.ADMINISTRATE_SERVER)
|| (rsrc.isUserOwner() && rsrc.getChange().getStatus() != Change.Status.MERGED);
return or(
rsrc.isUserOwner() && rsrc.getChange().getStatus() != Change.Status.MERGED,
user.testCond(GlobalPermission.ADMINISTRATE_SERVER));
}
}

4
gerrit-server/src/main/java/com/google/gerrit/server/change/DeletePrivateByPost.java
View File

@@ -14,6 +14,8 @@
package com.google.gerrit.server.change;
import static com.google.gerrit.extensions.conditions.BooleanCondition.and;
import com.google.gerrit.extensions.webui.UiAction;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.ChangeMessagesUtil;
@@ -39,6 +41,6 @@ public class DeletePrivateByPost extends DeletePrivate implements UiAction<Chang
return new UiAction.Description()
.setLabel("Unmark private")
.setTitle("Unmark change as private")
.setVisible(rsrc.getChange().isPrivate() && canDeletePrivate(rsrc));
.setVisible(and(rsrc.getChange().isPrivate(), canDeletePrivate(rsrc)));
}
}