DEBUG = True
TITLE = u"Cavote FFDN"
EMAIL = '"' + TITLE + '"' + ' <' + u"cavote@ffdn.org" + '>'
-VERSION = "cavote 0.1.1"
+VERSION = "cavote 0.2.0"
SMTP_SERVER = "127.0.0.1"
PATTERNS = {u'Oui/Non': [u'Oui', u'Non'], u'Oui/Non/Blanc': [u'Oui', u'Non', u'Blanc'], u'Oui/Non/Peut-être': [u'Oui', u'Non', u'Peut-être']}
if request.method == 'POST':
if query_db('select * from users where email=? and id!=?', [request.form['email'], userid], one=True) is None:
if query_db('select * from users where name=? and id!=?', [request.form['name'], userid], one=True) is None:
- g.db.execute('update users set email = ?, name = ?, organization = ? where id = ?',
- [request.form['email'], request.form['name'], request.form['organization'], session['user']['id']])
+ g.db.execute('update users set email = ?, openid = ?, name = ?, organization = ? where id = ?',
+ [request.form['email'], request.form['openid'], request.form['name'], request.form['organization'], session['user']['id']])
g.db.commit()
disconnect_user()
user = query_db('select * from users where id=?', [userid], one=True)
admin = 0
if 'admin' in request.form.keys():
admin = 1
- g.db.execute('update users set email = ?, name = ?, organization = ?, is_admin = ? where id = ?',
- [request.form['email'], request.form['name'], request.form['organization'], admin, iduser])
+ g.db.execute('update users set email = ?, name = ?, organization = ?, openid= ?, is_admin = ? where id = ?',
+ [request.form['email'], request.form['name'], request.form['organization'], request.form['openid'], admin, iduser])
g.db.commit()
groups = request.form.getlist('groups')
groups.append('1')
basequery = 'select votes.*, max_votes from votes left join (' + max_votes + ') as max_votes on votes.id_group = max_votes.id_group'
nb_votes = 'select id_vote, count(*) as nb_votes from (select id_user, id_vote from user_choice join choices on id_choice = choices.id group by id_user, id_vote) group by id_vote'
basequery = 'select * from (' + basequery + ') left join (' + nb_votes + ') on id = id_vote'
- basequery = 'select *, votes.id as voteid, groups.name as groupname from (' + basequery + ') as votes join groups on groups.id = id_group where is_open=1'
+ basequery = 'select *, votes.id as voteid, groups.name as groupname from (' + basequery + ') as votes join groups on groups.id = id_group where is_open=1 and is_hidden=0'
if votes == 'all':
votes = query_db(basequery + ' order by date_end')
elif votes == 'archive':
def admin_votes():
if not session.get('user').get('is_admin'):
abort(401)
- votes = query_db('select *, votes.id as voteid, groups.name as groupname from votes join groups on groups.id=votes.id_group order by id desc')
+ votes = query_db('select *, votes.id as voteid, groups.name as groupname from votes join groups on groups.id=votes.id_group where is_hidden=0 order by id desc')
return render_template('admin_votes.html', votes=votes, today=date.today().strftime("%Y-%m-%d"))
@app.route('/admin/votes/add', methods=['GET', 'POST'])
flash(u'La deadline du vote est expirée, vous devriez terminer le vote.')
return render_template('admin_vote_edit.html', vote=vote, group=group, choices=choices, attachments=attachments)
+@app.route('/admin/votes/delete/<idvote>')
+def admin_vote_del(idvote):
+ if not session.get('user').get('is_admin'):
+ abort(401)
+ vote = query_db('select * from votes where id = ?', [idvote], one=True)
+ if vote is None:
+ abort(404)
+ g.db.execute('update votes set is_hidden=1 where id = ?', [idvote])
+ g.db.commit()
+ return redirect(url_for('admin_votes'))
+
@app.route('/admin/votes/addchoice/<voteid>', methods=['POST'])
def admin_vote_addchoice(voteid):
if not session.get('user').get('is_admin'):