From ea22ed15253ede8591a26e4c7b91a8bf2abcadbc Mon Sep 17 00:00:00 2001 From: Arnaud Delcasse Date: Thu, 30 Aug 2012 11:25:34 +0200 Subject: [PATCH] Return to join method for fetching publisher --- main.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/main.py b/main.py index 4ccd46c..c3ebd37 100755 --- a/main.py +++ b/main.py @@ -432,7 +432,7 @@ def has_voted(idvote, iduser=-1): @app.route('/vote/', methods=['GET', 'POST']) def vote(idvote): - vote = query_db('select votes.*, groups.name as groupname from votes join groups on groups.id=votes.id_group where votes.id=?', [idvote], one=True) + vote = query_db('select votes.*, groups.name as groupname, users.name as author from votes join groups on groups.id=votes.id_group join users on users.id=votes.id_author where votes.id=?', [idvote], one=True) if vote is None: abort(404) if can_see_vote(idvote, get_userid()): @@ -478,11 +478,6 @@ def vote(idvote): vote['percent'] = int((float(vote['nb_votes']) / float(vote['max_votes'])) * 100) if query_db('select * from user_group where id_group = ? and id_user = ?', [vote['id_group'], get_userid()], one=True) and not vote['is_terminated']: flash(u'Ce vote vous concerne !', 'info') - publisher = query_db("select name from users where id = ?", [vote['id_author']], one=True) - if publisher is None: - vote['author'] = "NDN" - else: - vote['author'] = publisher['name'] return render_template('vote.html', vote=vote, attachments=attachments, choices=choices, users=users.values(), can_vote=can_vote(idvote, get_userid())) flash(u'Vous n\'avez pas le droit de voir ce vote, désolé.') return redirect(url_for('home')) -- 2.20.1