opendev/gerrit
Code Issues Proposed changes

Normalize label names in PostReview

Browse Source 
Labels are looked up case-insensitively so votes are applied
properly, but the names used in changes messages and events matched
the case provided by the user. Fix this to use the canonical label
case instead.

Bug: Issue 2033
Change-Id: I5d17afea35d6e0ca960845a470535a1abcd8432a
This commit is contained in:
Dave Borowitz
2013-07-25 09:11:36 -07:00
parent 89c3c582b6
commit 70adeaeb92
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java
View File

@@ -424,11 +424,12 @@ public class PostReview implements RestModifyView<RevisionResource, Input> {
}
PatchSetApproval c = current.remove(name);
String normName = lt.getName();
if (ent.getValue() == null || ent.getValue() == 0) {
// User requested delete of this label.
if (c != null) {
if (c.getValue() != 0) {
labelDelta.add("-" + name);
labelDelta.add("-" + normName);
}
del.add(c);
}
@@ -437,10 +438,10 @@ public class PostReview implements RestModifyView<RevisionResource, Input> {
c.setGranted(timestamp);
c.cache(change);
upd.add(c);
labelDelta.add(format(name, c.getValue()));
categories.put(name, c.getValue());
labelDelta.add(format(normName, c.getValue()));
categories.put(normName, c.getValue());
} else if (c != null && c.getValue() == ent.getValue()) {
current.put(name, c);
current.put(normName, c);
} else if (c == null) {
c = new PatchSetApproval(new PatchSetApproval.Key(
rsrc.getPatchSet().getId(),
@@ -450,8 +451,8 @@ public class PostReview implements RestModifyView<RevisionResource, Input> {
c.setGranted(timestamp);
c.cache(change);
ins.add(c);
labelDelta.add(format(name, c.getValue()));
categories.put(name, c.getValue());
labelDelta.add(format(normName, c.getValue()));
categories.put(normName, c.getValue());
}
}