opendev/gerrit
Code Issues Proposed changes

Fix submit rule evaluation for non blocking labels

Browse Source 
Putting a negative score on a label configured as `NoBlock` causes
the submit button to be disabled.  However, a `NoBlock` label is
supposed to be purely informational and its values not considered
when determining whether a change is submittable.

Fix the submit rule evaluation to prevent the button from being
disabled.

Also add an integration test.

Bug: Issue 2453
Change-Id: I0825b3c2d4774c17d523ac5f7890b983fa07af39
This commit is contained in:
David Ostrovsky
2014-02-07 08:57:58 +01:00
committed by David Pursehouse
parent 882f1aae78
commit 5a32a6dc15
4 changed files with 228 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
View File

@@ -454,21 +454,13 @@ public class ChangeJson {
return;
}
if (score != 0) {
if (score == type.getMin().getValue()) {
label.rejected = accountLoader.get(accountId);
} else if (score == type.getMax().getValue()) {
label.approved = accountLoader.get(accountId);
} else if (score < 0) {
label.disliked = accountLoader.get(accountId);
label.value = score;
} else if (score > 0 && label.disliked == null) {
label.recommended = accountLoader.get(accountId);
label.value = score;
}
if (score < 0) {
label.disliked = accountLoader.get(accountId);
label.value = score;
} else if (score > 0 && label.disliked == null) {
label.recommended = accountLoader.get(accountId);
label.value = score;
}
return;
}
private void setAllApprovals(ChangeData cd,
@@ -984,19 +976,19 @@ public class ChangeJson {
String message;
}
static class LabelInfo {
public static class LabelInfo {
transient SubmitRecord.Label.Status _status;
AccountInfo approved;
AccountInfo rejected;
AccountInfo recommended;
AccountInfo disliked;
List<ApprovalInfo> all;
public AccountInfo approved;
public AccountInfo rejected;
public AccountInfo recommended;
public AccountInfo disliked;
public List<ApprovalInfo> all;
Map<String, String> values;
public Map<String, String> values;
Short value;
Boolean optional;
public Short value;
public Boolean optional;
void addApproval(ApprovalInfo ai) {
if (all == null) {