diff options
| author | Edwin Kempin <ekempin@google.com> | 2016-11-18 12:53:59 -0800 |
|---|---|---|
| committer | Paladox <thomasmulhall410@yahoo.com> | 2017-04-30 01:05:29 +0100 |
| commit | 3851d0c0aa7f8787e60dfa88814b9cf186baba9f (patch) | |
| tree | d71564ac0f6f5bf316d275b0400a11047b5eeb6d | |
| parent | 3e1d4cde3fc2d0f0b3db4ea5930d9f9d88753724 (diff) | |
ChangeScreen: Expect that current revision can be null
Change-Id: I9f15935bb11e07ac27d367e2bdb2d4e055c8263b
Signed-off-by: Edwin Kempin <ekempin@google.com>
| -rw-r--r-- | gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java | 3 | ||||
| -rw-r--r-- | gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChanges.java | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java index 5707a7ef40..87997d14a6 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java @@ -435,7 +435,8 @@ public class ChangeScreen extends Screen { } private void gotoSibling(int offset) { - if (offset > 0 && changeInfo.currentRevision().equals(revision)) { + if (offset > 0 && changeInfo.currentRevision() != null + && changeInfo.currentRevision().equals(revision)) { return; } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChanges.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChanges.java index cc5c9b7894..0d0dba752e 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChanges.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChanges.java @@ -215,10 +215,12 @@ public class RelatedChanges extends TabPanel { EnumSet.of(ListChangesOption.CURRENT_REVISION, ListChangesOption.CURRENT_COMMIT), new TabChangeListCallback(Tab.CHERRY_PICKS, info.project(), revision)); - // TODO(sbeller): show only on latest revision - ChangeApi.change(info.legacyId().get()).view("submitted_together") - .get(new TabChangeListCallback(Tab.SUBMITTED_TOGETHER, - info.project(), revision)); + if (info.currentRevision() != null + && info.currentRevision().equals(revision)) { + ChangeApi.change(info.legacyId().get()).view("submitted_together") + .get(new TabChangeListCallback(Tab.SUBMITTED_TOGETHER, + info.project(), revision)); + } if (!Gerrit.info().change().isSubmitWholeTopicEnabled() && info.topic() != null && !"".equals(info.topic())) { |