X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=main.py;h=9012c645e0a35610c4293710931a1a4b3a4790ed;hb=8acf2e83b397f891410e68f8227a0d91cc289e56;hp=80934652562c75b953612e49adcaa318a4edfa8f;hpb=61a11c1aae7ed1ded0116b2e1e1fe3323ab7db6b;p=cavote.git diff --git a/main.py b/main.py index 8093465..9012c64 100755 --- a/main.py +++ b/main.py @@ -344,7 +344,7 @@ def admin_user_edit(iduser): g.db.execute('delete from user_group where id_user = ? and id_group = ?', [iduser, group['id']]) g.db.commit() for group in groups: - group = query_db('select id from groups where id = ?', group, one=True) + group = query_db('select id from groups where id = ?', [group], one=True) if group is None: flash(u'Le groupe portant l\'id %s n\'existe pas.' % group, 'warning') else: @@ -542,6 +542,7 @@ def vote(idvote): group by id_group', [vote['id_group']], one=True) if max_votes is None: vote['percent'] = 0 + vote['nb_votes'] = 0 else: vote['max_votes'] = max_votes['nb'] votes = query_db('select id_vote, count(*) as nb \ @@ -707,7 +708,7 @@ def admin_vote_add(): cardinal_values = cardinals[cardinal]['values'] weight = cardinals[cardinal]['first'] if not cardinals[cardinal]['first'] is None else -(cardinal/2) if query_db('select * from cardinals where id = ?', [cardinal], one=True) is None: - g.db.execute('insert into cardinals (id, name) values (?, ?)', [len(cardinal_values), cardinal_name]) + g.db.execute('insert into cardinals (id, name, first) values (?, ?, ?)', [len(cardinal_values), cardinal_name, weight]) g.db.commit() for name in cardinal_values: g.db.execute('insert into values_ (id_cardinal, name, weight) values (?, ?, ?)'