From e115b0678cce0f918e1985524751f95c21dd2b2d Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Sun, 19 Jan 2020 19:48:41 +0000
Subject: Fix password issues caused by Flask-User migration

---
 app/templates/flask_user/login.html       |  2 +-
 app/templates/flask_user/public_base.html | 13 -------------
 app/templates/flask_user_layout.html      | 13 +++++++++++++
 3 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 app/templates/flask_user/public_base.html
 create mode 100644 app/templates/flask_user_layout.html

(limited to 'app/templates')

diff --git a/app/templates/flask_user/login.html b/app/templates/flask_user/login.html
index a134388..3e93d38 100644
--- a/app/templates/flask_user/login.html
+++ b/app/templates/flask_user/login.html
@@ -15,7 +15,7 @@ Sign in
 				{{ form.hidden_tag() }}
 
 				{# Username or Email field #}
-				{% set field = form.username if user_manager.USER_ENABLE_REGISTER else form.email %}
+				{% set field = form.username if user_manager.USER_ENABLE_USERNAME else form.email %}
 				<div class="form-group {% if field.errors %}has-error{% endif %}">
 					{# Label on left, "New here? Register." on right #}
 					<label for="{{ field.id }}" class="control-label">{{ field.label.text }}</label>
diff --git a/app/templates/flask_user/public_base.html b/app/templates/flask_user/public_base.html
deleted file mode 100644
index 272e1ec..0000000
--- a/app/templates/flask_user/public_base.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends "base.html" %}
-
-{% block container %}
-	<main class="container mt-4">
-		<div class="card">
-			<!-- <h2 class="card-header">{{ self.title() }}</h2> -->
-			<div class="card-body">
-				{% block content %}
-				{% endblock %}
-			</div>
-		</div>
-	</main>
-{% endblock %}
diff --git a/app/templates/flask_user_layout.html b/app/templates/flask_user_layout.html
new file mode 100644
index 0000000..272e1ec
--- /dev/null
+++ b/app/templates/flask_user_layout.html
@@ -0,0 +1,13 @@
+{% extends "base.html" %}
+
+{% block container %}
+	<main class="container mt-4">
+		<div class="card">
+			<!-- <h2 class="card-header">{{ self.title() }}</h2> -->
+			<div class="card-body">
+				{% block content %}
+				{% endblock %}
+			</div>
+		</div>
+	</main>
+{% endblock %}
-- 
cgit v1.2.3