aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThibaut Horel <thibaut.horel@gmail.com>2012-11-14 12:35:03 +0100
committerThibaut Horel <thibaut.horel@gmail.com>2012-11-14 12:35:03 +0100
commitd4023dcd0bcb2cea41ccee75cb78432a9eef920f (patch)
treed40020c2889fe75394d01e35ec735694c904fb96
parente92f8608664381b6002a025e490588df208234cc (diff)
downloadfamille-flask-d4023dcd0bcb2cea41ccee75cb78432a9eef920f.tar.gz
Add a link to the news page in the email
-rw-r--r--famille.py21
-rw-r--r--settings.ini2
2 files changed, 14 insertions, 9 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,
diff --git a/settings.ini b/settings.ini
index f1e9892..9d7a0b4 100644
--- a/settings.ini
+++ b/settings.ini
@@ -3,7 +3,7 @@ DEBUG = True
SECRET_KEY = '\x95\x98j\xcaL\xaeA\xf9\xe6-\xa7uV\xe5Y\x83\xe0\xab\x00\xb6\xeb\xde\xc2\x14'
USERNAME = 'admin'
PASSWORD = 'default'
-
+SERVER_NAME = 'famille.horel.org'
MAIL_SERVER = 'smtp.gmail.com'
MAIL_USE_TLS = True
MAIL_PORT = 587