diff options
author | Shawn O. Pearce <sop@google.com> | 2012-10-25 10:54:34 -0700 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-10-25 11:35:13 -0700 |
commit | b8adb7f36f24b6ecea84a7f72e8af21d142e4d94 (patch) | |
tree | a1fd1bb5bd2b18612418e33337022060d6526db5 | |
parent | f360d97a6fbc6ff47776485f65b046409dfd761c (diff) |
Fix owner column to link to same status
If a change search result is displaying merged changes, clicking
on the owner name should query for merged changes by the owner.
Bug: issue 1596
Change-Id: Ib103f8d15d66273ca034e05ef71721dbba3ab723
-rw-r--r-- | gerrit-common/src/main/java/com/google/gerrit/common/PageLinks.java | 19 | ||||
-rw-r--r-- | gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable2.java | 2 |
2 files changed, 13 insertions, 8 deletions
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/PageLinks.java b/gerrit-common/src/main/java/com/google/gerrit/common/PageLinks.java index e57d704a0e..2b9b72a61b 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/PageLinks.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/PageLinks.java @@ -60,8 +60,11 @@ public class PageLinks { } public static String toAccountQuery(final String fullname) { - String query = op("owner", fullname) + " status:open"; - return toChangeQuery(query, TOP); + return toAccountQuery(fullname, Status.NEW); + } + + public static String toAccountQuery(String fullname, Status status) { + return toChangeQuery(op("owner", fullname) + " " + status(status), TOP); } public static String toChangeQuery(final String query) { @@ -73,17 +76,19 @@ public class PageLinks { } public static String projectQuery(Project.NameKey proj, Status status) { + return status(status) + " " + op("project", proj.get()); + } + + private static String status(Status status) { switch (status) { case ABANDONED: - return "status:abandoned " + op("project", proj.get()); - + return "status:abandoned"; case MERGED: - return "status:merged " + op("project", proj.get()); - + return "status:merged"; case NEW: case SUBMITTED: default: - return "status:open " + op("project", proj.get()); + return "status:open"; } } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable2.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable2.java index 0dd0b0f8a7..20dd80f3a7 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable2.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable2.java @@ -213,7 +213,7 @@ public class ChangeTable2 extends NavigationTable<ChangeInfo> { } table.setWidget(row, C_OWNER, new InlineHyperlink(owner, - PageLinks.toAccountQuery(owner))); + PageLinks.toAccountQuery(owner, c.status()))); table.setWidget( row, C_PROJECT, new ProjectLink(c.project_name_key(), c.status())); |