opendev/gerrit
Code Issues Proposed changes

Merge "Move: 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 b5e4b56fce eea33ed68c
commit 01de1fc23f
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gerrit-server/src/main/java/com/google/gerrit/server/change/Move.java
View File

@@ -14,6 +14,7 @@
package com.google.gerrit.server.change; package com.google.gerrit.server.change;
import static com.google.gerrit.extensions.conditions.BooleanCondition.and;
import static com.google.gerrit.server.permissions.ChangePermission.ABANDON; import static com.google.gerrit.server.permissions.ChangePermission.ABANDON;
import static com.google.gerrit.server.permissions.RefPermission.CREATE_CHANGE; import static com.google.gerrit.server.permissions.RefPermission.CREATE_CHANGE;
import static com.google.gerrit.server.query.change.ChangeData.asChanges; import static com.google.gerrit.server.query.change.ChangeData.asChanges;
@@ -215,11 +216,13 @@ public class Move extends RetryingRestModifyView<ChangeResource, MoveInput, Chan
.setLabel("Move Change") .setLabel("Move Change")
.setTitle("Move change to a different branch") .setTitle("Move change to a different branch")
.setVisible( .setVisible(
change.getStatus().isOpen() and(
&& permissionBackend change.getStatus().isOpen(),
and(
permissionBackend
.user(rsrc.getUser()) .user(rsrc.getUser())
.ref(change.getDest()) .ref(change.getDest())
.testOrFalse(CREATE_CHANGE) .testCond(CREATE_CHANGE),
&& rsrc.permissions().database(dbProvider).testOrFalse(ABANDON)); rsrc.permissions().database(dbProvider).testCond(ABANDON))));
} }
} }