From 32cf4354854dcc2c98faba437fc6794d731fda2e Mon Sep 17 00:00:00 2001
From: Byron Jones
Date: Wed, 9 Sep 2015 13:06:50 +0800
Subject: Bug 1202975 - warning about api key requirement is no longer shown
when enabling 2fa
---
template/en/default/account/prefs/mfa.html.tmpl | 31 +++++++++++++++----------
1 file changed, 19 insertions(+), 12 deletions(-)
(limited to 'template')
diff --git a/template/en/default/account/prefs/mfa.html.tmpl b/template/en/default/account/prefs/mfa.html.tmpl
index 2a2cdf220..d6bec08a5 100644
--- a/template/en/default/account/prefs/mfa.html.tmpl
+++ b/template/en/default/account/prefs/mfa.html.tmpl
@@ -58,7 +58,20 @@
- [% INCLUDE api_key_pref_blurb %]
+ [% IF user.settings.api_key_only.value == 'on' %]
+ Enabling two-factor authentication has also required systems that
+ interface with [% terms.Bugzilla %]'s API to use API keys
+ for authentication.
+
+ While not recommended, this limitation can be lifted by changing the
+ Require API key authentication for API requests
+ preference.
+ [% ELSE %]
+ Systems that interface with [% terms.Bugzilla %]'s API are not required to use API keys.
+ Change the
+ Require API key authentication for API requests
+ preference to enforce API key usage.
+ [% END %]
[% ELSE %]
@@ -142,18 +155,12 @@
- [% INCLUDE api_key_pref_blurb %]
+ Enabling two-factor authentication will also require systems that
+ interface with [% terms.Bugzilla %]'s API to use API keys
+ for authentication. While not recommended, this limitation can be lifted by changing the
+ Require API key authentication for API requests
+ preference after 2FA is enabled.
-
-[% BLOCK api_key_pref_blurb %]
- Enabling two-factor authentication will also require systems that
- interface with [% terms.Bugzilla %]'s API to use API keys
- for authentication.
-
- While not recommended, this limitation can be lifted by changing the
- Require API key authentication for API requests
- preference after 2FA is enabled.
-[% END %]
--
cgit v1.2.3-24-g4f1b