From 39211ff4b651db33ecd6d1f7e3bdbb2efac7cacd Mon Sep 17 00:00:00 2001 From: Oliver Date: Fri, 20 Dec 2024 09:12:14 +1100 Subject: [PATCH] Fix MFA auth flow (#8720) (#8724) * Re-add html account base Fixes #8690 * fix base template Co-authored-by: Matthias Mair --- src/backend/InvenTree/templates/403_csrf.html | 2 +- .../InvenTree/templates/account/base.html | 90 +------------------ 2 files changed, 4 insertions(+), 88 deletions(-) diff --git a/src/backend/InvenTree/templates/403_csrf.html b/src/backend/InvenTree/templates/403_csrf.html index e9441cb613..e66345fb56 100644 --- a/src/backend/InvenTree/templates/403_csrf.html +++ b/src/backend/InvenTree/templates/403_csrf.html @@ -1,4 +1,4 @@ -{% extends "account/base.html" %} +{% extends "skeleton.html" %} {% load i18n %} {% load inventree_extras %} diff --git a/src/backend/InvenTree/templates/account/base.html b/src/backend/InvenTree/templates/account/base.html index cec3145135..0e298e8cc0 100644 --- a/src/backend/InvenTree/templates/account/base.html +++ b/src/backend/InvenTree/templates/account/base.html @@ -1,55 +1,9 @@ -{% load static %} +{% extends "skeleton.html" %} {% load i18n %} {% load inventree_extras %} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {% inventree_title %} | {% block head_title %}{% endblock head_title %} - - -{% block extra_head %} -{% endblock extra_head %} - - +{% block body %} -
@@ -80,42 +34,4 @@ {% block extra_body %} {% endblock extra_body %}
- - - - -{% include "third_party_js.html" %} - - - - - - - - +{% endblock body %}