opendev/gerrit
Code Issues Proposed changes

Merge changes from topic 'subm'

Browse Source 
* changes:
  Rework SUBM label in LabelId
  ReceiveCommits: Add SUBM approval when closing changes
This commit is contained in:
Dave Borowitz
2016-03-09 22:04:35 +00:00
committed by Gerrit Code Review
parent 745609b882 79ecc14466
commit 8fba0e255e
14 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeField.java
View File

@@ -359,7 +359,7 @@ public class ChangeField {
Set<String> allApprovals = Sets.newHashSet();
Set<String> distinctApprovals = Sets.newHashSet();
for (PatchSetApproval a : input.currentApprovals()) {
if (a.getValue() != 0 && !a.isSubmit()) {
if (a.getValue() != 0 && !a.isLegacySubmit()) {
allApprovals.add(formatLabel(a.getLabel(), a.getValue(),
a.getAccountId()));
distinctApprovals.add(formatLabel(a.getLabel(), a.getValue()));