summaryrefslogtreecommitdiffstats
path: root/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java
diff options
context:
space:
mode:
authorIsmo Haataja <ismo.haataja@digia.com>2014-06-16 14:36:21 +0300
committerIsmo Haataja <ismo.haataja@digia.com>2014-06-19 12:30:58 +0200
commit0fd0dbe04ae8f7513d94a6ce83f5a8ea8e1e62d0 (patch)
tree564343a7389934fba90562fcc2876291b00a7fc9 /gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java
parent9f9d801a36e0b3de06f52be5215e8a4e02cfdd78 (diff)
Always allow commenting a patch setv2.7.0-based
Prevent giving review scores but allow commenting for a change in CI states (STAGING, STAGED or INTEGRATING). No need to block it with error message like before. Also if the state has changed to one of CI states while reviewing, review scores are dropped, just comments are saved. Task-number: QTQAINFRA-858 Change-Id: I684f004a1d680b2db184fedb50d936337f603721 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Ismo Haataja <ismo.haataja@digia.com>
Diffstat (limited to 'gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java')
-rw-r--r--gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PublishCommentScreen.java8
1 files changed, 7 insertions, 1 deletions
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() {
}
}