Markupsafe bulletin

sondregronas · Aug 24, 2023 · 8cab546 · 8cab546
1 parent 7deb398
commit 8cab546
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/BookingSystem/db.py b/BookingSystem/db.py
@@ -1,6 +1,8 @@
 import sqlite3
 from pathlib import Path
 
+import markupsafe
+
 from __init__ import DATABASE, logger
 
 
@@ -31,10 +33,7 @@ def get(key: str) -> str:
         value = con.execute('SELECT value FROM settings WHERE name = ?', (key,)).fetchone()
         con.close()
 
-        if not value:
-            return ''
-
-        return value[0]
+        return markupsafe.Markup(value[0]) if value else ''
 
     @staticmethod
     def set(key: str, value: str) -> None:

diff --git a/BookingSystem/templates/forms/bulletin.html b/BookingSystem/templates/forms/bulletin.html
@@ -1,6 +1,7 @@
 <form id="update-bulletin">
     <label for="bulletin_title">Tittel</label>
-    <input name="bulletin_title" id="bulletin_title" placeholder="Tittel" value="{{ bulletin_title }}" maxlength="50"
+    <input name="bulletin_title" id="bulletin_title" placeholder="Tittel (Valgfritt)" value="{{ bulletin_title }}"
+           maxlength="50"
            autocomplete="off">
     <label for="bulletin">Tekst</label>
     <input name="bulletin" id="bulletin" placeholder="Tekst" value="{{ bulletin }}"