From 117c51d10e41ce68fad7ca4369b8ddf99bf6953e Mon Sep 17 00:00:00 2001 From: Mo8it Date: Fri, 29 Jul 2022 02:22:04 +0200 Subject: [PATCH] Remove SERVER_NAME from Flask config --- advlabdb/__init__.py | 2 -- advlabdb/model_dependent_funs.py | 8 +++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/advlabdb/__init__.py b/advlabdb/__init__.py index 1c593a9..b3ee1bb 100644 --- a/advlabdb/__init__.py +++ b/advlabdb/__init__.py @@ -20,8 +20,6 @@ load_dotenv(".env") app = Flask(__name__) -set_from_env(app, "SERVER_NAME") - set_from_env(app, "SECRET_KEY") # Setup Flask-SQLAlchemy diff --git a/advlabdb/model_dependent_funs.py b/advlabdb/model_dependent_funs.py index ceda672..47e65d7 100644 --- a/advlabdb/model_dependent_funs.py +++ b/advlabdb/model_dependent_funs.py @@ -3,8 +3,9 @@ Functions dependent on advlabdb.models. """ from functools import cache +from os import environ -from flask import flash, url_for +from flask import flash from flask_admin.menu import MenuLink from flask_security import current_user from wtforms.fields import BooleanField, IntegerField, SelectField, StringField @@ -22,7 +23,8 @@ def initActiveSemesterMenuLinks(space): space.add_link( MenuLink( name=str(semester), - url=url_for("set_semester") + "?semester_id=" + str(semester.id), + # Using SERVER_NAME because of missing request context + url=environ["SERVER_NAME"] + "/set_semester" + "?semester_id=" + str(semester.id), category="Active semester", ) ) @@ -31,7 +33,7 @@ def initActiveSemesterMenuLinks(space): "ERROR: The Semester table does not exist yet! Therefore, menu links could not be generated. You can ignore this error if you are just initializing the database." ) else: - space.add_link(MenuLink(name="Logout", url=url_for("security.logout"))) + space.add_link(MenuLink(name="Logout", url=environ["SERVER_NAME"] + "/logout")) def active_semester_str():