diff options
author | Ismo Haataja <ismo.haataja@digia.com> | 2013-04-30 15:14:54 +0300 |
---|---|---|
committer | Ismo Haataja <ismo.haataja@digia.com> | 2013-08-22 07:42:01 +0200 |
commit | 8a29078540e2d9afb8fe1ff381424df5979d8d81 (patch) | |
tree | aee61f2446422712ebf4e54f368fd4a2be384ec4 /gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java | |
parent | 42d1d7d1aabd0dcfd0a0439c57c4427e5790136e (diff) |
Add new change state "deferred".v2.2.1-based
Support for new change state "deferred" to be able to discern
"really dead" from "postponed" changes. This is equal to "abandoned"
for all practical purposes except presentation and filtering. State
transitions are possible between "review in progress", "abandoned"
and "deferred". And menu bar has new "All/deferred" and "My/Deferred
Changes" default filters.
Task-number: QTQAINFRA-598
Change-Id: I57b4f716fb826c5f246d02463b1ed9c75c4d04ae
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java')
-rw-r--r-- | gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java index 2677084bef..10f509fcc3 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java @@ -202,6 +202,9 @@ public class Dispatcher { } else if ("mine,drafts".equals(token)) { return QueryScreen.forQuery("has:draft"); + } else if ("mine,deferred".equals(token)) { + return QueryScreen.forQuery("owner:" + Gerrit.getUserAccount().getUserName() + " status:deferred"); + } else { String p = "mine,watched,"; if (token.startsWith(p)) { @@ -215,6 +218,11 @@ public class Dispatcher { private static Screen all(final String token) { String p; + p = "all,deferred,"; + if (token.startsWith(p)) { + return QueryScreen.forQuery("status:deferred", skip(p, token)); + } + p = "all,abandoned,"; if (token.startsWith(p)) { return QueryScreen.forQuery("status:abandoned", skip(p, token)); @@ -266,6 +274,16 @@ public class Dispatcher { s.substring(c + 1)); } + p = "project,deferred,"; + if (token.startsWith(p)) { + final String s = skip(p, token); + final int c = s.indexOf(','); + Project.NameKey proj = Project.NameKey.parse(s.substring(0, c)); + return QueryScreen.forQuery( // + "status:deferred " + op("project", proj.get()), // + s.substring(c + 1)); + } + return new NotFoundScreen(); } |