From 7dbaf5706b81afdf9e5e30fec51b1c86d1522a5b Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 11 May 2016 09:01:21 +0300 Subject: [PATCH] RelatedChanges: Show "Submitted Together" also for changes with topic The reason for hiding the Submitted Together tab is that when SubmitWholeTopic option is enabled, the same changes would appear twice - in Submitted Together and in Same Topic. But when some changes have topic, and the Submit Whole Topic option is disabled, there's no reason to hide the Submitted Together tab. This tab also shows changes that are submitted together because of project submit strategy, like Merge or Rebase If Necessary. Change-Id: Ibbafbdbea921444278efc602801d28b756145f25 --- .../google/gerrit/client/change/RelatedChanges.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 9612f71736..3be3486549 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,6 +215,11 @@ 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 (!Gerrit.info().change().isSubmitWholeTopicEnabled() && info.topic() != null && !"".equals(info.topic())) { StringBuilder topicQuery = new StringBuilder(); @@ -226,11 +231,6 @@ public class RelatedChanges extends TabPanel { ListChangesOption.DETAILED_LABELS, ListChangesOption.LABELS), new TabChangeListCallback(Tab.SAME_TOPIC, info.project(), revision)); - } else { - // TODO(sbeller): show only on latest revision - ChangeApi.change(info.legacyId().get()).view("submitted_together") - .get(new TabChangeListCallback(Tab.SUBMITTED_TOGETHER, - info.project(), revision)); } }