fixed up the comment system

1 files changed, 12 insertions, 1 deletions

diff --git a/famille.py b/famille.py
index bda0440..d026bfe 100644
--- a/famille.py
+++ b/famille.py
@@ -25,6 +25,15 @@ def format_date(datetime_string, format="%a %d %b %Y"):
     return datetime.strptime(datetime_string[:-1],
                              "%Y-%m-%dT%H:%M:%S").strftime(format)
 
+@app.template_filter('pluralize')
+def pluralize(ncomments):
+    if ncomments==0:
+        return "Aucun Commentaire"
+    elif ncomments==1:
+         return "1 Commentaire"
+    else:
+        return  "{0} Commentaires".format(ncomments)
+
 def query_db(query, args=(), one=False):
     cur = g.db.execute(query, args)
     rv = cur.fetchone() if one else cur.fetchall()
@@ -54,7 +63,9 @@ def login_required(f):
 @app.route('/news/')
 @login_required
 def list_news():
-    news = query_db("SELECT * FROM news LEFT JOIN users ON news.user_id = users.id")
+    news = query_db("SELECT news.*, users.user_name, count(comments.id) as ncomments FROM news "
+    "LEFT JOIN users ON news.user_id = users.id "
+    "LEFT JOIN comments ON news.id=comments.news_id GROUP BY news.id")
     return render_template("news/list.html", news=news)
 
 @app.route('/news/add/', methods=['GET', 'POST'])