From: Julien Moutinho Date: Tue, 16 Sep 2014 23:28:08 +0000 (+0200) Subject: fix vote termination X-Git-Url: http://git.cyclocoop.org/?p=cavote.git;a=commitdiff_plain;h=686111838d941f51a51c3f7e0e311898750cbdb4 fix vote termination --- diff --git a/main.py b/main.py index 9012c64..9ce0797 100755 --- a/main.py +++ b/main.py @@ -432,9 +432,9 @@ def votes(votes): 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 and is_hidden=0' + where is_hidden=0' if votes == 'all': - votes = query_db(basequery + ' order by date_end') + votes = query_db(basequery + ' and is_open=1 order by date_end') elif votes == 'archive': votes = query_db(basequery + ' and is_terminated=1 order by date_end desc') elif votes == 'current': @@ -816,7 +816,7 @@ def admin_vote_edit(voteid): choices = query_db('select * from choices where id_vote = ?', [voteid]) values_ = query_db('select * from cardinals where id = ?', [vote['id_cardinal']], one=True)['name'] attachments = query_db('select * from attachments where id_vote = ?', [voteid]) - if date.today().strftime("%Y-%m-%d") > vote['date_end']: + if date.today().strftime("%Y-%m-%d") > vote['date_end'] and not vote['is_terminated']: 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, values_=values_, choices=choices, attachments=attachments, quorums=QUORUMS) diff --git a/templates/admin_vote_edit.html b/templates/admin_vote_edit.html index 1b0c3eb..5a467f3 100644 --- a/templates/admin_vote_edit.html +++ b/templates/admin_vote_edit.html @@ -140,6 +140,7 @@ {% else %} + {% endif %} {% endif %}