summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdwin Kempin <edwin.kempin@sap.com>2014-07-16 13:56:17 +0200
committerJan Kundrát <jkt@flaska.net>2014-11-24 20:17:15 +0000
commit10701e23ac2827cf7429e273f9385b8efa3ccf8a (patch)
treea1fdcd5c12f1287bde0428a851ffaa7c05db66d1
parent2b2d62b1d1704b639287fc62fe87bedf2cab85bf (diff)
Remove 'send email' checkbox from reply box on change screen
When replying to a change the 'send email' checkbox allowed to control if the change update should trigger email notifications for other users. This behaviour is bad for people who want to rely on email notifications since it depends on the replying users whether they get an email notification or not. By removing the 'send email' checkbox people are again in control about their own email notifications, e.g. by the watch settings they can configure which emails they want to receive. Still suppressing email notifications via the REST API is possible (and wanted, e.g. for CI jobs). Change-Id: If11863da6020a1d5b7edc1ae1a1a60399b197267 Signed-off-by: Edwin Kempin <edwin.kempin@sap.com> (cherry picked from commit 00aa3bfb977faf6e70f58a99bbba5ba4d77ab8c3)
-rw-r--r--Documentation/images/user-review-ui-change-screen-replying.pngbin56618 -> 55835 bytes
-rw-r--r--Documentation/user-review-ui.txt5
-rw-r--r--gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.java10
-rw-r--r--gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.ui.xml2
4 files changed, 1 insertions, 16 deletions
diff --git a/Documentation/images/user-review-ui-change-screen-replying.png b/Documentation/images/user-review-ui-change-screen-replying.png
index 0fd5e80981..0ae85ab0f4 100644
--- a/Documentation/images/user-review-ui-change-screen-replying.png
+++ b/Documentation/images/user-review-ui-change-screen-replying.png
Binary files differ
diff --git a/Documentation/user-review-ui.txt b/Documentation/user-review-ui.txt
index 40df914d90..5bc5b44546 100644
--- a/Documentation/user-review-ui.txt
+++ b/Documentation/user-review-ui.txt
@@ -601,11 +601,6 @@ comment needs to be edited.
The `Post` button publishes the comments and the votes.
-The `send email` checkbox controls whether the reply should trigger
-email notifications for other users. Deselecting the checkbox means
-that there will be no email notification about the change update to the
-change author, the reviewers or any other user.
-
image::images/user-review-ui-change-screen-replying.png[width=800, link="images/user-review-ui-change-screen-replying.png"]
If a user can approve a label that is still required, a quick approve
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.java
index 64dcd286e4..1c30928405 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.java
@@ -99,7 +99,6 @@ class ReplyBox extends Composite {
@UiField Element labelsParent;
@UiField Grid labelsTable;
@UiField Button post;
- @UiField CheckBox email;
@UiField Button cancel;
@UiField ScrollPanel commentsPanel;
@UiField FlowPanel comments;
@@ -188,15 +187,6 @@ class ReplyBox extends Composite {
}
}
- @UiHandler("email")
- void onEmail(ValueChangeEvent<Boolean> e) {
- if (e.getValue()) {
- in.notify(ReviewInput.NotifyHandling.ALL);
- } else {
- in.notify(ReviewInput.NotifyHandling.NONE);
- }
- }
-
@UiHandler("post")
void onPost(ClickEvent e) {
in.message(getMessage());
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.ui.xml
index 1b122c5179..3c927fc0d3 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.ui.xml
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyBox.ui.xml
@@ -68,7 +68,7 @@ limitations under the License.
styleName='{res.style.button}'>
<ui:attribute name='title'/>
<div>Post</div>
- </g:Button> and <g:CheckBox ui:field='email' value='true'>send email</g:CheckBox></ui:msg>
+ </g:Button></ui:msg>
<g:Button ui:field='cancel'
title='Close reply form (Shortcut: Esc)'