From 7bc18ad4630fe4c525ccb66f21d47486d5c48b2b Mon Sep 17 00:00:00 2001 From: Guillaume Horel Date: Tue, 13 Nov 2012 22:39:26 -0500 Subject: Add the preview feature not that well tested, so might kill your kitties. --- famille.py | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) (limited to 'famille.py') diff --git a/famille.py b/famille.py index c1fa510..686878b 100644 --- a/famille.py +++ b/famille.py @@ -110,23 +110,29 @@ def add_news(): if request.method == 'POST': content = request.form['content'] content_cache = rstify(content) - - # send email - emails = query_db("SELECT email from users where notify=1") - emails = [email["email"] for email in emails] - message = Message(request.form['title'], sender="news.horel@gmail.com") - message.html = content_cache - message.recipients = emails - mail.send(message) - - cur = g.db.execute("INSERT INTO news " - "('title', 'content', 'user_id', 'content_cache') " - "VALUES (?, ?, ?, ?)", - (request.form['title'], content, - session['user_id'], content_cache)) - news_id = cur.lastrowid - g.db.commit() - return redirect(url_for('show_news', news_id=news_id)) + if 'Add' in request.form: + # send email + emails = query_db("SELECT email from users where notify=1") + emails = [email["email"] for email in emails] + if emails: + message = Message(request.form['title'], + sender="news.horel@gmail.com") + message.html = content_cache + message.recipients = list(emails) + mail.send(message) + + cur = g.db.execute("INSERT INTO news " + "('title', 'content', 'user_id', 'content_cache') " + "VALUES (?, ?, ?, ?)", + (request.form['title'], content, + session['user_id'], content_cache)) + news_id = cur.lastrowid + g.db.commit() + return redirect(url_for('show_news', news_id=news_id)) + else: + news = {'content': content,'content_cache': content_cache, + 'title': request.form['title']} + return render_template("news/preview.html", news=news) elif request.method == 'GET': return render_template("news/add.html") -- cgit v1.2.3-70-g09d2