Also use rst for news content

3 files changed, 6 insertions, 5 deletions

diff --git a/famille.py b/famille.py
index 6b128d6..87a1118 100644
--- a/famille.py
+++ b/famille.py
@@ -8,7 +8,7 @@ import hashlib
 from docutils import core
 from docutils.writers.html4css1 import Writer
 
-def rstify_comment(string):
+def rstify(string):
     w = Writer()
     result = core.publish_parts(string, writer=w)['fragment']
     return result
@@ -53,9 +53,10 @@ def list_news():
 @login_required
 def add_news():
     if request.method == 'POST':
+        content = rstify(request.form['content'])
         cur = g.db.execute("INSERT INTO news ('title', 'content', 'user_id') "
                            "VALUES (?, ?, ?)",
-                           (request.form['title'], request.form['content'],
+                           (request.form['title'], content,
                             session['user_id']))
         news_id = cur.lastrowid
         g.db.commit()
@@ -80,7 +81,7 @@ def show_news(news_id):
                      "VALUES (?, ?, ?)", (user_id, content, news_id))
         g.db.commit()
         return redirect(url_for('show_news', news_id=news_id))
-        
+
 @app.route('/login/', methods=['GET', 'POST'])
 def login():
     if 'user_name' in session:
diff --git a/templates/news/list.html b/templates/news/list.html
index 6ddf85a..ecb0714 100644
--- a/templates/news/list.html
+++ b/templates/news/list.html
@@ -11,7 +11,7 @@
   </div>
   
   <div class="news_content">
-    {{ news.content }}
+    {{ news.content|safe }}
   </div>
   {% endfor %}
 </div>
diff --git a/templates/news/show.html b/templates/news/show.html
index 459d9a4..35c510f 100644
--- a/templates/news/show.html
+++ b/templates/news/show.html
@@ -13,7 +13,7 @@
 <h1>{{news.title}}</h1>
 
 <div class="news_content">
-{{news.content}}
+{{news.content|safe}}
 </div>
 
 <hr/>