opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.12'

Browse Source 
* stable-2.12:
  AccountManager: Update display name only if it is not null.
  ChangeHookValidator: Fix old revision retrieval for root commit
  InlineEdit: Enable inline comments retrieval in change screen
  BanCommitCommand: Do not use commons.collections

Change-Id: I777d6fcfbd1ee647322268ebc8c404a0723a3dfe
This commit is contained in:
David Pursehouse
2015-11-12 12:48:06 -08:00
parent 0cdfd0caf6 e7eeacbf9e
commit 9fb3074eac
6 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java
View File

@@ -881,7 +881,12 @@ public class ChangeScreen extends Screen {
CallbackGroup group = new CallbackGroup();
Timestamp lastReply = myLastReply(info);
if (rev.isEdit()) {
loadFileList(b, rev, lastReply, group, null, null);
// Comments are filtered for the current revision. Use parent
// patch set for edits, as edits themself can never have comments.
RevisionInfo p = RevisionInfo.findEditParentRevision(
info.revisions().values());
List<NativeMap<JsArray<CommentInfo>>> comments = loadComments(p, group);
loadFileList(b, rev, lastReply, group, comments, null);
} else {
loadDiff(b, rev, lastReply, group);
}