summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
authorByron Jones <glob@mozilla.com>2015-10-29 17:04:56 +0100
committerByron Jones <glob@mozilla.com>2015-10-29 17:04:56 +0100
commitb6d9211091e8d35f638b67b2b25fb3b00fb93134 (patch)
tree2d69ff90d8f2aa2255812b621e09bee6361b6c67 /template/en
parent175f9c1022672ae8d47c93ad0cf31084eb868ecb (diff)
downloadbugzilla-b6d9211091e8d35f638b67b2b25fb3b00fb93134.tar.gz
bugzilla-b6d9211091e8d35f638b67b2b25fb3b00fb93134.tar.xz
Bug 1213757 - delegate password and 2fa resets to servicedesk
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/admin/users/userdata.html.tmpl2
-rw-r--r--template/en/default/global/user-error.html.tmpl4
2 files changed, 5 insertions, 1 deletions
diff --git a/template/en/default/admin/users/userdata.html.tmpl b/template/en/default/admin/users/userdata.html.tmpl
index a455ef84b..449a1b143 100644
--- a/template/en/default/admin/users/userdata.html.tmpl
+++ b/template/en/default/admin/users/userdata.html.tmpl
@@ -126,7 +126,7 @@
<tr>
<th><label for="mfa">Two-factor Auth:</label></th>
<td>
- [% IF user.in_group('admin') %]
+ [% IF user.in_group('bz_can_disable_mfa') %]
[% IF otheruser.mfa %]
<select name="mfa" value="mfa">
<option value="">Disable</option>
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 66573ecb1..6996832aa 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1220,6 +1220,10 @@
<br>
The QR code has been deleted - please generate and scan a new code.
+ [% ELSIF error == "mfa_disable_denied" %]
+ [% title = "Change Denied" %]
+ You do not have permission to disable MFA for other users.
+
[% ELSIF error == "migrate_config_created" %]
The file <kbd>[% file FILTER html %]</kbd> contains configuration
variables that must be set before continuing with the migration.