projects
/
selectricity-live
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix weird bug with showing results from open elections
[selectricity-live]
/
app
/
controllers
/
voter_controller.rb
diff --git
a/app/controllers/voter_controller.rb
b/app/controllers/voter_controller.rb
index 45b9a1a85f950cec5d54320942917be65071352c..afc01039b8e535b7733844f44bf0b5429ed64b2e 100644
(file)
--- a/
app/controllers/voter_controller.rb
+++ b/
app/controllers/voter_controller.rb
@@
-27,11
+27,12
@@
class VoterController < ApplicationController
if params[:election_id]
@election = Election.find(params[:election_id])
unless @election.authenticated?
if params[:election_id]
@election = Election.find(params[:election_id])
unless @election.authenticated?
- @voter = Voter.find(:all,
+ @voter =
Open
Voter.find(:all,
:conditions => ["session_id = ? and election_id = ?",
session.session_id, @election.id])[0]
:conditions => ["session_id = ? and election_id = ?",
session.session_id, @election.id])[0]
- @voter = Voter.new unless @voter
+
+ @voter = OpenVoter.new unless @voter
@voter.election = @election
@voter.session_id = session.session_id
@voter.election = @election
@voter.session_id = session.session_id
@@
-53,7
+54,7
@@
class VoterController < ApplicationController
@voter.vote = Vote.new
@voter.save
end
@voter.vote = Vote.new
@voter.save
end
-
+
@voter.vote.set_defaults! if @voter.vote.rankings.empty?
# if the election is now finished
@voter.vote.set_defaults! if @voter.vote.rankings.empty?
# if the election is now finished
@@
-152,6
+153,7
@@
class VoterController < ApplicationController
end
def results
end
def results
+ debugger
if authenticate and
(@voter.election.early_results? \
or @voter.election.enddate < Time.now)
if authenticate and
(@voter.election.early_results? \
or @voter.election.enddate < Time.now)
@@
-193,12
+195,22
@@
class VoterController < ApplicationController
password = params[:id]
if password == "open"
election = Election.find(params[:format])
password = params[:id]
if password == "open"
election = Election.find(params[:format])
+
+ # double check to make sure the election is not authenticated
unless election.authenticated?
unless election.authenticated?
- @voter = Voter.find(:all,
+ @voter =
Open
Voter.find(:all,
:conditions => ["session_id = ? and election_id = ?",
session.session_id, election.id])[0]
:conditions => ["session_id = ? and election_id = ?",
session.session_id, election.id])[0]
+
+ # if the election is over, proceed
+ if (not @voter) and (election.enddate < Time.now)
+ @voter = OpenVoter.new
+ @voter.election = election
+ end
+
@password = "open." + election.id.to_s
end
@password = "open." + election.id.to_s
end
+
else
@voter = FullVoter.find(:all,
:conditions => [ "password = ?", password ] )[0]
else
@voter = FullVoter.find(:all,
:conditions => [ "password = ?", password ] )[0]
Benjamin Mako Hill
||
Want to submit a patch?