aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--famille.py36
1 files changed, 20 insertions, 16 deletions
diff --git a/famille.py b/famille.py
index 207d3ac..6bd1eef 100644
--- a/famille.py
+++ b/famille.py
@@ -122,13 +122,14 @@ def add_news():
content = request.form['content']
content_cache = rstify(content)
if 'Add' in request.form:
- cur = get_db().execute("INSERT INTO news "
- "('title', 'content', 'user_id', 'content_cache') "
- "VALUES (?, ?, ?, ?)",
- (request.form['title'], content,
- session['user_id'], content_cache))
+ db = get_db()
+ cur = 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
- get_db().commit()
+ db.commit()
# send email
emails = query_db("SELECT email from users where notify=1")
@@ -168,11 +169,12 @@ def show_news(news_id):
user_id = session['user_id']
content = request.form['content']
content_cache = rstify(content)
- get_db().execute("INSERT INTO comments "
+ db = get_db()
+ db.execute("INSERT INTO comments "
"('user_id', 'content', 'news_id', 'content_cache') "
"VALUES (?, ?, ?, ?)",
(user_id, content, news_id, content_cache))
- get_db().commit()
+ db.commit()
return redirect(url_for('show_news', news_id=news_id))
@app.route('/news/<int:news_id>/edit', methods=['GET', 'POST'])
@@ -187,17 +189,17 @@ def edit_news(news_id):
title = request.form['title']
content = request.form['content']
content_cache = rstify(content)
- get_db().execute("UPDATE news SET 'title'=?, 'content'=?, 'content_cache'=? "
+ db = get_db()
+ db.execute("UPDATE news SET 'title'=?, 'content'=?, 'content_cache'=? "
"WHERE news.id =?",
(title, content, content_cache, news_id))
- get_db().commit()
+ db.commit()
return redirect(url_for('show_news', news_id=news_id))
@app.route('/user/<int:user_id>/')
@login_required
def view_user(user_id):
- db = get_db()
- user = query_db(db, 'SELECT * FROM users WHERE id= ?', (user_id,), True)
+ user = query_db('SELECT * FROM users WHERE id= ?', (user_id,), True)
return render_template("user/show.html", user=user)
@app.route('/user/edit/', methods=['GET', 'POST'])
@@ -226,8 +228,9 @@ def edit_user():
sqlstr = "UPDATE users SET email= ?, phone=?, birthday=?, nameday=?," \
"address_line1=?, address_line2=?, address_city_line=?, timezone=?, notify=? " \
"where id=?"
- get_db().execute(sqlstr, args)
- get_db().commit()
+ db = get_db()
+ db.execute(sqlstr, args)
+ db.commit()
session["timezone"] = request.form["timezone"]
return redirect(url_for('view_user', user_id=session['user_id']))
@@ -247,9 +250,10 @@ def login():
session['user_name'] = user['user_name']
session['user_id'] = user['id']
session['timezone'] = user['timezone'] or "UTC"
- get_db().execute("UPDATE users SET last_seen=? WHERE id=?",
+ db = get_db()
+ db.execute("UPDATE users SET last_seen=? WHERE id=?",
(datetime.utcnow(),session['user_id']))
- get_db().commit()
+ db.commit()
return redirect(url_for('list_news'))
else:
error = u'Mot de passe incorrect'