projects
/
selectricity
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed up a series of things in prepration for the stress test on friday
[selectricity]
/
app
/
controllers
/
quickvote_controller.rb
diff --git
a/app/controllers/quickvote_controller.rb
b/app/controllers/quickvote_controller.rb
index 5bf89c775b18026810fa74b89bcea3fe5184ec0b..4b3c0c988d75544b3b9f93945a48e8a016f3fec0 100644
(file)
--- a/
app/controllers/quickvote_controller.rb
+++ b/
app/controllers/quickvote_controller.rb
@@
-44,6
+44,7
@@
class QuickvoteController < ApplicationController
#Give registered users additional QuickVote functionality
@quickvote.user_id = session[:user][:id] if session[:user]
#Give registered users additional QuickVote functionality
@quickvote.user_id = session[:user][:id] if session[:user]
+ @quickvote.create_candidates
# try to save, if it fails, show the page again (the flash should
# still be intact
# try to save, if it fails, show the page again (the flash should
# still be intact
@@
-96,6
+97,13
@@
class QuickvoteController < ApplicationController
# if the person has specified an election, we show them the voting
# page. otherwise, we redirect back to main the page
if @election
# if the person has specified an election, we show them the voting
# page. otherwise, we redirect back to main the page
if @election
+
+ # if the election is over, redirect to the the results page
+ unless @election.active?
+ redirect_to quickaction_url(:ident => params[:ident],
+ :action => 'results')
+ end
+
# look to see that the voter has been created and has voted in
# this election, and has confirmed their vote
@voter = QuickVoter.find(:all,
# look to see that the voter has been created and has voted in
# this election, and has confirmed their vote
@voter = QuickVoter.find(:all,
Benjamin Mako Hill
||
Want to submit a patch?