Add a link to the news page in the email

1 files changed, 13 insertions, 8 deletions

diff --git a/famille.py b/famille.py
index ab47090..32528bf 100644
--- a/famille.py
+++ b/famille.py
@@ -118,6 +118,14 @@ def add_news():
         content = request.form['content']
         content_cache = rstify(content)
         if 'Add' in request.form:
+            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()
+
             # send email
             emails = query_db("SELECT email from users where notify=1")
             emails = [email["email"] for email in emails]
@@ -125,16 +133,13 @@ def add_news():
                 message = Message(request.form['title'],
                                   sender="news.horel@gmail.com")
                 message.html = content_cache
-                message.recipients = list(emails)
+                url = url_for('show_news', news_id=news_id, _external=True)
+                message.html += "<p style='margin-top:2em'>Vous pouvez <a href='{0}'>"\
+                                "Lire cette nouvelle</a> sur le site de la famille.</p>".\
+                                format(url)
+                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))
         else:
             news = {'content': content,'content_cache': content_cache,