summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
authorkarl.kornel%mindspeed.com <>2006-07-30 12:50:24 +0200
committerkarl.kornel%mindspeed.com <>2006-07-30 12:50:24 +0200
commitddddaf2b67207056ebb407ea68f9e0e6a697a37e (patch)
tree3c6f037aed9ba5afb9e7459c8d11a59fd6b07928 /template/en
parentcd9cf6add14c1d76c571eeb99331631d74d209d9 (diff)
downloadbugzilla-ddddaf2b67207056ebb407ea68f9e0e6a697a37e.tar.gz
bugzilla-ddddaf2b67207056ebb407ea68f9e0e6a697a37e.tar.xz
Bug 100953: Move data/nomail into the DB and implement a UI to edit it
Patch by A. Karl Kornel <karl@kornel.name> r=wurblzap a=justdave
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/admin/users/userdata.html.tmpl18
-rw-r--r--template/en/default/global/messages.html.tmpl6
2 files changed, 24 insertions, 0 deletions
diff --git a/template/en/default/admin/users/userdata.html.tmpl b/template/en/default/admin/users/userdata.html.tmpl
index afb402554..be29a1b4b 100644
--- a/template/en/default/admin/users/userdata.html.tmpl
+++ b/template/en/default/admin/users/userdata.html.tmpl
@@ -70,6 +70,24 @@
</td>
</tr>
<tr>
+ <th><label for="disable_mail">Bugmail Disabled:</label></th>
+ <td>
+ <input type="checkbox" name="disable_mail" id="disable_mail" value="1"
+ [% IF otheruser.email_disabled %] checked="checked" [% END %] />
+ (This affects bugmail and whinemail, not password-reset or other
+ non-bug-related emails)
+ [% IF editform %]
+ <input type="hidden" name="disable_mail_old"
+ [% IF otheruser.email_disabled %]
+ value="1"
+ [% ELSE %]
+ value="0"
+ [% END %]
+ />
+ [% END %]
+ </td>
+ </tr>
+ <tr>
<th><label for="disabledtext">Disable text:</label></th>
<td>
[% INCLUDE global/textarea.html.tmpl
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index 45b584bea..08321ed2c 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -57,6 +57,12 @@
A new password has been set.
[% ELSIF field == 'disabledtext' %]
The disable text has been modified.
+ [% ELSIF field == 'disable_mail' %]
+ [% IF otheruser.email_disabled %]
+ Bugmail has been disabled.
+ [% ELSE %]
+ Bugmail has been enabled.
+ [% END %]
[% END %]
</li>
[% END %]