diff options
Diffstat (limited to 'gerrit-gwtui/src/main/java/com/google/gerrit/client/changes')
9 files changed, 70 insertions, 0 deletions
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(); } |