diff options
author | David Lawrence <dlawrence@mozilla.com> | 2011-08-10 00:03:23 +0200 |
---|---|---|
committer | David Lawrence <dlawrence@mozilla.com> | 2011-08-10 00:03:23 +0200 |
commit | 4b113460e54775cbd3e5e412ad37b9ba7ab66edc (patch) | |
tree | 5acc4fc6552f9a343c28d70ce663af70359a57b9 /template/en/default/admin | |
parent | 80c6d150b42ae5d9ba7464c5e20023cc90388259 (diff) | |
download | bugzilla-4b113460e54775cbd3e5e412ad37b9ba7ab66edc.tar.gz bugzilla-4b113460e54775cbd3e5e412ad37b9ba7ab66edc.tar.xz |
Bug 585440 - Allow disabled accounts to turn off all bugmail
r/a=mkanat
Diffstat (limited to 'template/en/default/admin')
-rw-r--r-- | template/en/default/admin/users/edit.html.tmpl | 1 | ||||
-rw-r--r-- | template/en/default/admin/users/userdata.html.tmpl | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/template/en/default/admin/users/edit.html.tmpl b/template/en/default/admin/users/edit.html.tmpl index 3efa4b8bf..d684dcebd 100644 --- a/template/en/default/admin/users/edit.html.tmpl +++ b/template/en/default/admin/users/edit.html.tmpl @@ -31,6 +31,7 @@ message = message style_urls = ['skins/standard/admin.css', 'skins/standard/editusers.css'] doc_section = "useradmin.html#modifyusers" + javascript_urls = [ 'js/field.js' ] %] [% PROCESS admin/users/listselectvars.html.tmpl diff --git a/template/en/default/admin/users/userdata.html.tmpl b/template/en/default/admin/users/userdata.html.tmpl index f3f0e5aa9..3315d87da 100644 --- a/template/en/default/admin/users/userdata.html.tmpl +++ b/template/en/default/admin/users/userdata.html.tmpl @@ -20,6 +20,10 @@ # otheruser: Bugzilla::User object of user to edit #%] +<script type="text/javascript"> + var disable_mail_manually_set = [% (otheruser.email_disabled ? 1 : 0) FILTER js %]; +</script> + <tr> <th><label for="login">Login name:</label></th> <td> @@ -86,7 +90,8 @@ <th><label for="disable_mail">[% terms.Bug %]mail Disabled:</label></th> <td> <input type="checkbox" name="disable_mail" id="disable_mail" value="1" - [% IF otheruser.email_disabled %] checked="checked" [% END %] /> + [% IF otheruser.email_disabled %] checked="checked" [% END %] + onchange="disable_mail_manually_set=1;"> (This affects [% terms.bug %]mail and whinemail, not password-reset or other non-[% terms.bug %]-related emails) </td> @@ -102,6 +107,7 @@ defaultrows = 10 cols = 60 defaultcontent = otheruser.disabledtext + onchange = "userDisabledTextOnChange(this);" %]<br> (If non-empty, then the account will be disabled, and this text should explain why.) |