projects
/
selectricity-live
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'live' of ssh://ephesus.xvm.mit.edu/org/selectricity/selectricity-live
[selectricity-live]
/
app
/
controllers
/
quickvote_controller.rb
diff --git
a/app/controllers/quickvote_controller.rb
b/app/controllers/quickvote_controller.rb
index 5bf89c775b18026810fa74b89bcea3fe5184ec0b..701005d08ed03f1835326cf2f598aaa663ea6ac7 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,
@@
-150,14
+158,16
@@
class QuickvoteController < ApplicationController
else
# record the ip address for posterity
else
# record the ip address for posterity
- @voter.ipaddress = request.env["
REMOTE_ADD
R"]
+ @voter.ipaddress = request.env["
HTTP_X_FORWARDED_FO
R"]
@voter.save
# toggle the confirmation bit
@voter.save
# toggle the confirmation bit
- @voter.vote.confirm!
-
- @voter.reload
- render :action => 'thanks'
+ if @voter.vote.confirm!
+ @voter.reload
+ render :action => 'thanks'
+ else
+ redirect_to :action => 'index'
+ end
end
end
end
end
@@
-175,9
+185,10
@@
class QuickvoteController < ApplicationController
@election=QuickVote.ident_to_quickvote(params[:id])
@election.voters.each do |voter|
next unless voter.ipaddress
@election=QuickVote.ident_to_quickvote(params[:id])
@election.voters.each do |voter|
next unless voter.ipaddress
+
location=nil
location=nil
- if
defined?
Cache and location=Cache.get("GEO:#{voter.ipaddress}")
- elsif
defined?
Cache
+ if Cache and location=Cache.get("GEO:#{voter.ipaddress}")
+ elsif Cache
location = GeoKit::Geocoders::IpGeocoder.geocode(voter.ipaddress)
Cache.set "GEO:#{voter.ipaddress}", location
else
location = GeoKit::Geocoders::IpGeocoder.geocode(voter.ipaddress)
Cache.set "GEO:#{voter.ipaddress}", location
else
Benjamin Mako Hill
||
Want to submit a patch?