opendev/gerrit
Code Issues Proposed changes

DeleteChange: Use BooleanCondition for #setVisible

Browse Source 
Change-Id: If8e6d6bc6c1779ee082813e053480b64c34c4b4d
This commit is contained in:
Patrick Hiesel
2017-08-16 17:02:12 +02:00
parent 2c76a76449
commit 5b3fa16f4a
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteChange.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.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.MethodNotAllowedException; import com.google.gerrit.extensions.restapi.MethodNotAllowedException;
@@ -100,7 +102,7 @@ public class DeleteChange extends RetryingRestModifyView<ChangeResource, Input,
return new UiAction.Description() return new UiAction.Description()
.setLabel("Delete") .setLabel("Delete")
.setTitle("Delete change " + rsrc.getId()) .setTitle("Delete change " + rsrc.getId())
.setVisible(couldDeleteWhenIn(status) && perm.testOrFalse(ChangePermission.DELETE)); .setVisible(and(couldDeleteWhenIn(status), perm.testCond(ChangePermission.DELETE)));
} }
private boolean couldDeleteWhenIn(Change.Status status) { private boolean couldDeleteWhenIn(Change.Status status) {