opendev/gerrit
Code Issues Proposed changes

Abandon: Use BooleanCondition for #setVisible

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

8
gerrit-server/src/main/java/com/google/gerrit/server/change/Abandon.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.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableListMultimap;
import com.google.common.collect.ListMultimap; import com.google.common.collect.ListMultimap;
import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.TimeUtil;
@@ -191,8 +193,8 @@ public class Abandon extends RetryingRestModifyView<ChangeResource, AbandonInput
.setLabel("Abandon") .setLabel("Abandon")
.setTitle("Abandon the change") .setTitle("Abandon the change")
.setVisible( .setVisible(
change.getStatus().isOpen() and(
&& change.getStatus() != Change.Status.DRAFT change.getStatus().isOpen() && change.getStatus() != Change.Status.DRAFT,
&& rsrc.permissions().database(dbProvider).testOrFalse(ChangePermission.ABANDON)); rsrc.permissions().database(dbProvider).testCond(ChangePermission.ABANDON)));
} }
} }