Show changes across all branches and projects in topics tab
If `submitWholeTopic` is enabled this tab will show all affected
changes which would be submitted. If it is disabled however this also makes
sense as the user probably wants to group things together by the topic.
Change-Id: I0553d4384f0fdef7c911d8358aefa9e2911662af
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 0b611c7..0c91abc 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
@@ -171,6 +171,8 @@
}
getTab(Tab.RELATED_CHANGES).setShowIndirectAncestors(true);
getTab(Tab.CHERRY_PICKS).setShowBranches(true);
+ getTab(Tab.SAME_TOPIC).setShowBranches(true);
+ getTab(Tab.SAME_TOPIC).setShowProjects(true);
}
void set(final ChangeInfo info, final String revision) {
@@ -198,8 +200,6 @@
if (info.topic() != null && !"".equals(info.topic())) {
StringBuilder topicQuery = new StringBuilder();
topicQuery.append("status:open");
- topicQuery.append(" ").append(op("project", info.project()));
- topicQuery.append(" ").append(op("branch", info.branch()));
topicQuery.append(" ").append(op("topic", info.topic()));
topicQuery.append(" ").append(op("-change", info.legacy_id().get()));
ChangeList.query(topicQuery.toString(),
@@ -329,6 +329,7 @@
c.set_change_number(i.legacy_id().get());
c.set_revision_number(currentRevision._number());
c.set_branch(i.branch());
+ c.set_project(i.project());
arr.push(c);
}
}
@@ -357,6 +358,7 @@
public final native CommitInfo commit() /*-{ return this.commit }-*/;
final native String branch() /*-{ return this.branch }-*/;
+ final native String project() /*-{ return this.project }-*/;
final native void set_id(String i)
/*-{ if(i)this.change_id=i; }-*/;
@@ -367,6 +369,9 @@
final native void set_branch(String b)
/*-{ if(b)this.branch=b; }-*/;
+ final native void set_project(String b)
+ /*-{ if(b)this.project=b; }-*/;
+
public final Change.Id legacy_id() {
return has_change_number() ? new Change.Id(_change_number()) : null;
}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChangesTab.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChangesTab.java
index 2dfd53e..492f30a 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChangesTab.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChangesTab.java
@@ -86,6 +86,7 @@
private final RelatedChanges.Tab subject;
private boolean showBranches;
+ private boolean showProjects;
private boolean showIndirectAncestors;
private boolean registerKeys;
private int maxHeight;
@@ -107,6 +108,10 @@
this.showBranches = showBranches;
}
+ void setShowProjects(boolean showProjects) {
+ this.showProjects = showProjects;
+ }
+
void setShowIndirectAncestors(boolean showIndirectAncestors) {
this.showIndirectAncestors = showIndirectAncestors;
}
@@ -277,6 +282,9 @@
if (url.startsWith("#")) {
sb.setAttribute("onclick", OPEN);
}
+ if (showProjects) {
+ sb.append(info.project()).append(": ");
+ }
if (showBranches) {
sb.append(info.branch()).append(": ");
}
