diff options
Diffstat (limited to 'gerrit-gwtui/src')
2 files changed, 8 insertions, 10 deletions
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 ed519e9ead..ec737ea901 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 @@ -634,15 +634,7 @@ class PatchSetComplexDisclosurePanel extends ComplexDisclosurePanel b.addClickHandler(new ClickHandler() { @Override public void onClick(final ClickEvent event) { - if (changeDetail.getChange().getStatus() == Change.Status.INTEGRATING - || changeDetail.getChange().getStatus() == Change.Status.STAGED - || changeDetail.getChange().getStatus() == Change.Status.STAGING) { - alertMessageBox(Util.C.headingReviewDisabled(), - Util.C.messageReviewDisabled()) - .center(); - } else { - Gerrit.display(Dispatcher.toPublish(patchSet.getId())); - } + Gerrit.display(Dispatcher.toPublish(patchSet.getId())); } }); actionsPanel.add(b); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java index 46607c4749..d1aee8c4a2 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java @@ -15,6 +15,7 @@ package com.google.gerrit.client.changes; +import com.google.gerrit.client.ErrorDialog; import com.google.gerrit.client.Gerrit; import com.google.gerrit.client.changes.ChangeInfo.ApprovalInfo; import com.google.gerrit.client.changes.ChangeInfo.LabelInfo; @@ -340,7 +341,7 @@ public class PublishCommentScreen extends AccountScreen implements descBlock.display(changeDetail, null, false, r.getPatchSetInfo(), r.getAccounts(), r.getSubmitTypeRecord(), commentLinkProcessor); - if (r.getChange().getStatus().isOpen()) { + if (r.getChange().getStatus().isOpen() && !r.getChange().getStatus().isCI()) { initApprovals(approvalPanel); approvals.display(change); } else { @@ -442,6 +443,9 @@ public class PublishCommentScreen extends AccountScreen implements staging(); } else { saveStateOnUnload = false; + if (!result.getMessage().isEmpty()) { + new ErrorDialog(result.getMessage()).center(); + } goChange(); } } @@ -467,6 +471,8 @@ public class PublishCommentScreen extends AccountScreen implements this.drafts = 'PUBLISH'; }-*/; + public final native String getMessage() /*-{ return this.message; }-*/; + protected ReviewInput() { } } |