projects
/
selectricity-live
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added first stab at a kiosk mode
[selectricity-live]
/
app
/
controllers
/
voter_controller.rb
diff --git
a/app/controllers/voter_controller.rb
b/app/controllers/voter_controller.rb
index c0634695e971db632506d491ebd5192865086973..a912824ebd25f6baf1539b320077e86004613ff3 100644
(file)
--- a/
app/controllers/voter_controller.rb
+++ b/
app/controllers/voter_controller.rb
@@
-19,8
+19,10
@@
class VoterController < ApplicationController
@voter = OpenVoter.find(:all,
:conditions => ["session_id = ? and election_id = ?",
session.session_id, @election.id])[0]
@voter = OpenVoter.find(:all,
:conditions => ["session_id = ? and election_id = ?",
session.session_id, @election.id])[0]
-
- @voter = OpenVoter.new unless @voter
+
+ unless @voter and not @voter.election.kiosk
+ @voter = OpenVoter.new
+ end
@voter.election = @election
@voter.session_id = session.session_id
@voter.election = @election
@voter.session_id = session.session_id
@@
-121,6
+123,8
@@
class VoterController < ApplicationController
if @voter.election.embeddable? and params[:embed] == "true" \
and @voter.election.early_results?
redirect_to :action => :results, :id => @password, :embed => 'true'
if @voter.election.embeddable? and params[:embed] == "true" \
and @voter.election.early_results?
redirect_to :action => :results, :id => @password, :embed => 'true'
+ elsif @voter.election.kiosk and params[:kiosk] = "true"
+ redirect_to :action => "kiosk_ready", :id => @password, :kiosk => true
else
render :action => 'thanks'
end
else
render :action => 'thanks'
end
@@
-176,7
+180,13
@@
class VoterController < ApplicationController
redirect_to :action => 'index'
end
end
redirect_to :action => 'index'
end
end
-
+
+ def kiosk_ready
+ if not authenticate
+ redirect_to :action => 'index', :kiosk => true
+ end
+ end
+
private
def authenticate
password = params[:id]
private
def authenticate
password = params[:id]
Benjamin Mako Hill
||
Want to submit a patch?