opendev/gerrit
Code Issues Proposed changes

Merge "DeletePrivateByPost: Use BooleanCondition for #setVisible"

Browse Source
This commit is contained in:
Shawn Pearce
2017-08-16 17:59:16 +00:00
committed by Gerrit Code Review
parent 7685cbdfac 3d958b3aac
commit f94d097ac1
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; 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.common.TimeUtil;
import com.google.gerrit.extensions.conditions.BooleanCondition;
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;
import com.google.gerrit.extensions.restapi.Response; import com.google.gerrit.extensions.restapi.Response;
@@ -56,7 +59,7 @@ public class DeletePrivate
protected Response<String> applyImpl( protected Response<String> applyImpl(
BatchUpdate.Factory updateFactory, ChangeResource rsrc, SetPrivateOp.Input input) BatchUpdate.Factory updateFactory, ChangeResource rsrc, SetPrivateOp.Input input)
throws RestApiException, UpdateException { throws RestApiException, UpdateException {
if (!canDeletePrivate(rsrc)) { if (!canDeletePrivate(rsrc).value()) {
throw new AuthException("not allowed to unmark private"); throw new AuthException("not allowed to unmark private");
} }
@@ -78,9 +81,10 @@ public class DeletePrivate
return Response.none(); return Response.none();
} }
protected boolean canDeletePrivate(ChangeResource rsrc) { protected BooleanCondition canDeletePrivate(ChangeResource rsrc) {
PermissionBackend.WithUser user = permissionBackend.user(rsrc.getUser()); PermissionBackend.WithUser user = permissionBackend.user(rsrc.getUser());
return user.testOrFalse(GlobalPermission.ADMINISTRATE_SERVER) return or(
|| (rsrc.isUserOwner() && rsrc.getChange().getStatus() != Change.Status.MERGED); 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; 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.extensions.webui.UiAction;
import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.ChangeMessagesUtil; import com.google.gerrit.server.ChangeMessagesUtil;
@@ -39,6 +41,6 @@ public class DeletePrivateByPost extends DeletePrivate implements UiAction<Chang
return new UiAction.Description() return new UiAction.Description()
.setLabel("Unmark private") .setLabel("Unmark private")
.setTitle("Unmark change as private") .setTitle("Unmark change as private")
.setVisible(rsrc.getChange().isPrivate() && canDeletePrivate(rsrc)); .setVisible(and(rsrc.getChange().isPrivate(), canDeletePrivate(rsrc)));
} }
} }