fedora_elections/__init__.py | 2 +- fedora_elections/elections.py | 2 +- fedora_elections/forms.py | 2 +- files/fedora-elections.spec | 6 +++++- 4 files changed, 8 insertions(+), 4 deletions(-) New commits: commit a24783841a20b1d4a40e32aba7070553b60d2bce Author: Pierre-Yves Chibon <pingou(a)pingoured.fr&gt; Date: Tue May 5 13:58:31 2015 +0200 Release 2.5.3 diff --git a/fedora_elections/__init__.py b/fedora_elections/__init__.py index 0e7fe48..4e6273c 100644 --- a/fedora_elections/__init__.py +++ b/fedora_elections/__init__.py @@ -24,7 +24,7 @@ # Pierre-Yves Chibon <pingou(a)fedoraproject.org&gt; # -__version__ = '2.5.2' +__version__ = '2.5.3' import logging import os diff --git a/files/fedora-elections.spec b/files/fedora-elections.spec index cdd1237..96660d9 100644 --- a/files/fedora-elections.spec +++ b/files/fedora-elections.spec @@ -1,7 +1,7 @@ %define modname fedora_elections Name: fedora-elections -Version: 2.5.2 +Version: 2.5.3 Release: 1%{?dist} Summary: Fedora elections application @@ -111,6 +111,10 @@ install -m 644 files/update_1_to_2.sql \ %changelog +* Tue May 05 2015 Pierre-Yves Chibon <pingou(a)pingoured.fr&gt; - 2.5.3-1 +- Update to 2.5.3 +- Fix the simplified range voting + * Wed Apr 29 2015 Pierre-Yves Chibon <pingou(a)pingoured.fr&gt; - 2.5.2-1 - Update to 2.5.2 - Make elections prettier on high resolution displays commit 38f9d277cffa535a96aeedb9b3ee7c302226361d Merge: d4b11b7 ad14d7c Author: Pierre-Yves Chibon <pingou(a)pingoured.fr&gt; Date: Tue May 5 14:00:44 2015 +0200 Merge pull request #44 from fedora-infra/fix_range_voting Fix simplified range voting commit ad14d7c3a4f40efed011c1f1ddb88c75f0095783 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr&gt; Date: Tue May 5 13:52:46 2015 +0200 Rename range_3 to range_simple as it can offer a wider range than 3 diff --git a/fedora_elections/forms.py b/fedora_elections/forms.py index 2603973..7d04a90 100644 --- a/fedora_elections/forms.py +++ b/fedora_elections/forms.py @@ -34,7 +34,7 @@ class ElectionForm(wtf.Form): choices=[ ('range', 'Range Voting'), ('simple', 'Simple Voting (choose one candidate in the list)'), - ('range_3', 'Simplified Range Voting (max is set below)'), + ('range_simple', 'Simplified Range Voting (max is set below)'), ('select', 'Select Voting (checkboxes for each candidate, ' 'maximum number of votes set below)'), ('irc', '+1/0/-1 voting'), commit e1a1b789821b17ac2b0b1b8d319e3b37f422b5e1 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr&gt; Date: Tue May 5 13:52:27 2015 +0200 Use vote_range() for both normal and simplified range voting diff --git a/fedora_elections/elections.py b/fedora_elections/elections.py index b04ee69..d46db72 100644 --- a/fedora_elections/elections.py +++ b/fedora_elections/elections.py @@ -112,7 +112,7 @@ def vote(election_alias): flask.flash('You have already voted in the election!') return safe_redirect_back() - if election.voting_type == 'range': + if election.voting_type.startswith('range'): return vote_range(election) elif election.voting_type == 'simple': return vote_simple(election)