From 75a639d27873b9bda20ae423d920ffbb0ca159dc Mon Sep 17 00:00:00 2001 From: Mo8it Date: Wed, 10 Aug 2022 01:14:25 +0200 Subject: [PATCH] Remove SERVER_NAME --- advlabdb/model_dependent_funs.py | 5 ++--- settings_example.ini | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/advlabdb/model_dependent_funs.py b/advlabdb/model_dependent_funs.py index 4a940e7..2fa296d 100644 --- a/advlabdb/model_dependent_funs.py +++ b/advlabdb/model_dependent_funs.py @@ -22,8 +22,7 @@ def initActiveSemesterMenuLinks(space, app): space.add_link( MenuLink( name=str(semester), - # Using SERVER_NAME because of missing request context - url=settings["SERVER_NAME"] + "/set_semester" + "?semester_id=" + str(semester.id), + url="/set_semester" + "?semester_id=" + str(semester.id), category="Active semester", ) ) @@ -32,7 +31,7 @@ def initActiveSemesterMenuLinks(space, app): "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=settings["SERVER_NAME"] + "/logout")) + space.add_link(MenuLink(name="Logout", url="/logout")) def active_semester_str(): diff --git a/settings_example.ini b/settings_example.ini index 8649708..b60a2f6 100644 --- a/settings_example.ini +++ b/settings_example.ini @@ -1,5 +1,4 @@ [Settings] -SERVER_NAME = localhost:5000 SQLITE_DB_PATH = /volumes/data/advlabdb.db CHECK_EMAIL_DELIVERABILITY = True SECURITY_PASSWORD_LENGTH_MIN = 15