diff options
Diffstat (limited to 'gerrit-gwtui/src/main/java')
16 files changed, 130 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(); } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java index 715d7d9917..288d7a38eb 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java @@ -457,6 +457,7 @@ public class Gerrit implements EntryPoint { addLink(m, C.menuAllStaged(), PageLinks.toChangeQuery("status:staged")); addLink(m, C.menuAllIntegrating(), PageLinks.toChangeQuery("status:integrating")); addLink(m, C.menuAllMerged(), PageLinks.toChangeQuery("status:merged")); + addLink(m, C.menuAllDeferred(), PageLinks.toChangeQuery("status:deferred")); addLink(m, C.menuAllAbandoned(), PageLinks.toChangeQuery("status:abandoned")); menuLeft.add(m, C.menuAll()); @@ -464,6 +465,8 @@ public class Gerrit implements EntryPoint { m = new LinkMenuBar(); addLink(m, C.menuMyChanges(), PageLinks.MINE); addLink(m, C.menuMyDrafts(), PageLinks.toChangeQuery("has:draft")); + addLink(m, C.menuMyDeferredChanges(), PageLinks.toChangeQuery( + "owner:" + Gerrit.getUserAccount().getUserName() + " status:deferred")); addLink(m, C.menuMyWatchedChanges(), PageLinks.toChangeQuery("is:watched status:open")); addLink(m, C.menuMyStarredChanges(), PageLinks.toChangeQuery("is:starred")); menuLeft.add(m, C.menuMine()); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.java index 58737d933f..1512742284 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.java @@ -57,10 +57,12 @@ public interface GerritConstants extends Constants { String menuAllIntegrating(); String menuAllMerged(); String menuAllAbandoned(); + String menuAllDeferred(); String menuMine(); String menuMyChanges(); String menuMyDrafts(); + String menuMyDeferredChanges(); String menuMyWatchedChanges(); String menuMyStarredChanges(); @@ -90,6 +92,7 @@ public interface GerritConstants extends Constants { String jumpAllOpen(); String jumpAllMerged(); String jumpAllAbandoned(); + String jumpAllDeferred(); String jumpMine(); String jumpMineDrafts(); String jumpMineWatched(); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.properties index 186fe2570c..17f678ba14 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.properties +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.properties @@ -39,12 +39,14 @@ menuAllStaged = Staged menuAllIntegrating = Integrating menuAllMerged = Merged menuAllAbandoned = Abandoned +menuAllDeferred = Deferred menuMine = My menuMyChanges = Changes menuMyDrafts = Drafts menuMyStarredChanges = Starred Changes menuMyWatchedChanges = Watched Changes +menuMyDeferredChanges = Deferred Changes menuAdmin = Admin menuPeople = People @@ -72,6 +74,7 @@ sectionJumping = Jumping jumpAllOpen = Go to all open changes jumpAllMerged = Go to all merged changes jumpAllAbandoned = Go to all abandoned changes +jumpAllDeferred = Go to all deferred changes jumpMine = Go to my dashboard jumpMineWatched = Go to watched changes jumpMineDrafts = Go to drafts diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritCss.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritCss.java index 2370f0f066..b41ac83fcb 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritCss.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritCss.java @@ -21,6 +21,8 @@ public interface GerritCss extends CssResource { String greenCheckClass(); String abandonChangeDialog(); String abandonMessage(); + String deferChangeDialog(); + String deferMessage(); String revertChangeDialog(); String revertMessage(); String accountContactOnFile(); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/JumpKeys.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/JumpKeys.java index 873045dd44..15e019d69a 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/JumpKeys.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/JumpKeys.java @@ -44,6 +44,12 @@ class JumpKeys { Gerrit.display(PageLinks.toChangeQuery("status:abandoned")); } }); + jumps.add(new KeyCommand(0, 'f', Gerrit.C.jumpAllDeferred()) { + @Override + public void onKeyPress(final KeyPressEvent event) { + Gerrit.display(PageLinks.toChangeQuery("status:deferred")); + } + }); if (Gerrit.isSignedIn()) { jumps.add(new KeyCommand(0, 'i', Gerrit.C.jumpMine()) { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeConstants.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeConstants.java index a3e3d6a5f0..f3e7a88d73 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeConstants.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeConstants.java @@ -22,6 +22,7 @@ public interface ChangeConstants extends Constants { String statusLongSubmitted(); String statusLongMerged(); String statusLongAbandoned(); + String statusLongDeferred(); String changesRecentlyClosed(); @@ -30,6 +31,7 @@ public interface ChangeConstants extends Constants { String draftsHeading(); String allOpenChanges(); String allAbandonedChanges(); + String allDeferredChanges(); String allMergedChanges(); String changeTableColumnID(); @@ -120,6 +122,12 @@ public interface ChangeConstants extends Constants { String oldVersionHistory(); String baseDiffItem(); + String buttonDeferChangeBegin(); + String buttonDeferChangeSend(); + String buttonDeferChangeCancel(); + String headingDeferMessage(); + String deferChangeTitle(); + String buttonReview(); String buttonPublishCommentsSend(); String buttonPublishSubmitSend(); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeConstants.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeConstants.properties index fea3723d2b..65bb065dbb 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeConstants.properties +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeConstants.properties @@ -2,6 +2,7 @@ statusLongNew = Review in Progress statusLongSubmitted = Submitted, Merge Pending statusLongMerged = Merged statusLongAbandoned = Abandoned +statusLongDeferred = Deferred starredHeading = Starred Changes watchedHeading = Open Changes of Watched Projects @@ -9,6 +10,7 @@ draftsHeading = Changes with unpublished drafts changesRecentlyClosed = Recently closed allOpenChanges = All open changes allAbandonedChanges = All abandoned changes +allDeferredChanges = All deferred changes allMergedChanges = All merged changes changeTableColumnID = ID @@ -90,6 +92,12 @@ abandonChangeTitle = Code Review - Abandon Change oldVersionHistory = Old Version History: baseDiffItem = Base +buttonDeferChangeBegin = Defer Change +buttonDeferChangeSend = Defer Change +buttonDeferChangeCancel = Cancel +headingDeferMessage = Defer Message: +deferChangeTitle = Code Review - Defer Change + buttonRevertChangeBegin = Revert Change buttonRevertChangeSend = Revert Change buttonRevertChangeCancel = Cancel diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages.java index b01fcdb457..782b63112d 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages.java @@ -24,6 +24,7 @@ public interface ChangeMessages extends Messages { String changesOpenInProject(String string); String changesMergedInProject(String string); String changesAbandonedInProject(String string); + String changesDeferredInProject(String string); String revertChangeDefaultMessage(String commitMsg, String commitId); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages.properties index 9ae7ec7dff..0f318d024c 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages.properties +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeMessages.properties @@ -4,6 +4,7 @@ changesReviewableBy = Review Requests for {0} changesOpenInProject = Open Changes In {0} changesMergedInProject = Merged Changes In {0} changesAbandonedInProject = Abandoned Changes In {0} +changesDeferredInProject = Deferred Changes In {0} revertChangeDefaultMessage = Revert \"{0}\"\n\nThis reverts commit {1} diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeSetComplexDisclosurePanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeSetComplexDisclosurePanel.java index 1ff53bf0bf..2056919600 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeSetComplexDisclosurePanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeSetComplexDisclosurePanel.java @@ -243,6 +243,25 @@ class ChangeSetComplexDisclosurePanel extends CommonComplexDisclosurePanel { actionsPanel.add(b); } + if (topicDetail.canDefer()) { + final Button b = new Button(Util.TC.buttonDeferTopicBegin()); + b.addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + b.setEnabled(false); + new CommentedChangeActionDialog<TopicDetail>(changeSet.getId(), createCommentedCallback(b), + Util.TC.deferTopicTitle(), Util.TC.headingDeferMessage(), + Util.TC.buttonDeferTopicSend(), Util.TC.buttonDeferTopicCancel(), + Gerrit.RESOURCES.css().deferChangeDialog(), Gerrit.RESOURCES.css().deferMessage()) { + public void onSend() { + Util.T_MANAGE_SVC.deferTopic(getChangeSetId() , getMessageText(), createCallback()); + } + }.center(); + } + }); + actionsPanel.add(b); + } + if (topicDetail.canAbandon()) { final Button b = new Button(Util.TC.buttonAbandonTopicBegin()); b.addClickHandler(new ClickHandler() { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetComplexDisclosurePanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetComplexDisclosurePanel.java index 2c044fa0f1..8fb10600eb 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetComplexDisclosurePanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetComplexDisclosurePanel.java @@ -283,6 +283,25 @@ class PatchSetComplexDisclosurePanel extends CommonComplexDisclosurePanel { actionsPanel.add(b); } + if (changeDetail.canDefer()) { + final Button b = new Button(Util.C.buttonDeferChangeBegin()); + b.addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + b.setEnabled(false); + new CommentedChangeActionDialog<ChangeDetail>(patchSet.getId(), createCommentedCallback(b), + Util.C.deferChangeTitle(), Util.C.headingDeferMessage(), + Util.C.buttonDeferChangeSend(), Util.C.buttonDeferChangeCancel(), + Gerrit.RESOURCES.css().deferChangeDialog(), Gerrit.RESOURCES.css().deferMessage()) { + public void onSend() { + Util.MANAGE_SVC.deferChange(getPatchSetId() , getMessageText(), createCallback()); + } + }.center(); + } + }); + actionsPanel.add(b); + } + if (changeDetail.canAbandon()) { final Button b = new Button(Util.C.buttonAbandonChangeBegin()); b.addClickHandler(new ClickHandler() { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/TopicConstants.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/TopicConstants.java index 0521b0bbaa..6846785684 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/TopicConstants.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/TopicConstants.java @@ -36,6 +36,12 @@ public interface TopicConstants extends Constants { String headingAbandonMessage(); String abandonTopicTitle(); + String buttonDeferTopicBegin(); + String buttonDeferTopicSend(); + String buttonDeferTopicCancel(); + String headingDeferMessage(); + String deferTopicTitle(); + String buttonRestoreTopicBegin(); String restoreTopicTitle(); String buttonRestoreTopicCancel(); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/TopicConstants.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/TopicConstants.properties index 91a374d4ad..851a6024c5 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/TopicConstants.properties +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/TopicConstants.properties @@ -10,6 +10,12 @@ buttonAbandonTopicCancel = Cancel headingAbandonMessage = Abandon Message: abandonTopicTitle = Code Review - Abandon Topic +buttonDeferTopicBegin = Defer Topic +buttonDeferTopicSend = Defer Topic +buttonDeferTopicCancel = Cancel +headingDeferMessage = Defer Message: +deferTopicTitle = Code Review - Defer Topic + buttonRevertTopicBegin = Revert Topic buttonRevertTopicSend = Revert Topic buttonRevertTopicCancel = Cancel diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/Util.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/Util.java index 296138f168..84a05d9247 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/Util.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/Util.java @@ -68,6 +68,8 @@ public class Util { return C.statusLongMerged(); case ABANDONED: return C.statusLongAbandoned(); + case DEFERRED: + return C.statusLongDeferred(); default: return status.name(); } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css b/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css index bcc7340b39..af45c3e7fa 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css @@ -1284,6 +1284,31 @@ a:hover.downloadLink { font-size: small; } +/** DeferChangeDialog **/ + +.deferChangeDialog .gwt-DisclosurePanel .header td { + font-weight: bold; + white-space: nowrap; +} + +.deferChangeDialog .smallHeading { + font-size: small; + font-weight: bold; + white-space: nowrap; +} +.deferChangeDialog .deferMessage { + margin-left: 10px; + background: trimColor; + padding: 5px 5px 5px 5px; +} +.deferChangeDialog .deferMessage textarea { + font-size: small; +} +.deferChangeDialog .gwt-Hyperlink { + white-space: nowrap; + font-size: small; +} + /** RevertChangeDialog **/ .revertChangeDialog .gwt-DisclosurePanel .header td { |