insert rendered html into db

2 files changed, 5 insertions, 4 deletions

diff --git a/app.py b/app.py
index cf0b0d4..1b878b5 100644
--- a/app.py
+++ b/app.py
@@ -75,14 +75,15 @@ def close_db(exception):
 @app.route('/')
 def root():
     jokes = db().getJokes()
-    for joke in jokes:
-        joke['text'] = Markup(markdown.markdown(joke['text'], extensions=['markdown.extensions.nl2br'], output_format="html5", safe_mode="remove"))  # TODO cache TODO safe_mode deprecated
+    #for joke in jokes:
     return render_template('index.html', jokes=jokes)
 
 @app.route('/submit', methods=['POST'])
 def submit():
     text = request.form['text']
-    db().addJoke(text)  # TODO auth
+    #joke['text'] =
+    text = Markup(markdown.markdown(text, extensions=['markdown.extensions.nl2br'], output_format="html5", safe_mode="remove"))  # TODO safe_mode deprecated
+    db().addJoke(text)
     return redirect('/')
 
 @app.route('/vote', methods=['POST'])
diff --git a/templates/index.html b/templates/index.html
index ef7559d..ca8f25b 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -20,7 +20,7 @@
                 <button class="btn{% if joke.reports>0 %}-flat{% endif %} col s12" type="submit" name="vote" value="downvote"><i class="material-icons">thumb_down</i> {{ joke.downvotes }}</button>
             </form>
             <div class="col s8 {% if joke.reports>0 %}grey-text{% endif %}">
-                <p>{{ joke.text }}</p>
+                <p>{{ joke.text|safe }}</p>
             </div>
             <form class="col s2" action="report" method="post">
                 <input type="hidden" name="id" value="{{ joke.id }}">