Take admin setting for 2FA into account when showing user 2FA badge #…

…1568
getgrav · Jan 7, 2019 · 89a0b44 · 89a0b44
1 parent bf802b0
commit 89a0b44
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 1. [](#improved)
     * Unset state from user if not super or user admin
     * Make new System Config layout responsive [#1579](https://github.com/getgrav/grav-plugin-admin/issues/1579)
+    * Take admin setting for 2FA into account when showing user 2FA badge [#1568](https://github.com/getgrav/grav-plugin-admin/issues/1568)
 1. [](#bugfix)
     * Removed `tabs`, `tab`, and `toggle` fields as they are now in Form plugin
 

diff --git a/themes/grav/templates/partials/nav-user-details.html.twig b/themes/grav/templates/partials/nav-user-details.html.twig
@@ -6,7 +6,7 @@
         {% include 'partials/nav-user-avatar.html.twig' %}
 
         <div class="admin-user-names">
-            <h4>{{ admin.user.fullname|e }} {% if admin.user.twofa_enabled %}<span class="badge">2FA</span>{% endif %}</h4>
+            <h4>{{ admin.user.fullname|e }} {% if admin.user.twofa_enabled and config.plugins.admin.twofa_enabled %}<span class="badge">2FA</span>{% endif %}</h4>
             <h5>{{ admin.user.title|e }}</h5>
         </div>
     </a>