projects
/
selectricity
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix bug that allowed votes with more rankings than candidates to be recorded
[selectricity]
/
app
/
controllers
/
quickvote_controller.rb
diff --git
a/app/controllers/quickvote_controller.rb
b/app/controllers/quickvote_controller.rb
index 768bdea261ba28000363e25e4da6d3c24b61e7e9..cd16743fcc16e2095f46b1eff115c47f2cd51d39 100644
(file)
--- a/
app/controllers/quickvote_controller.rb
+++ b/
app/controllers/quickvote_controller.rb
@@
-17,6
+17,7
@@
# <http://www.gnu.org/licenses/>.
class QuickvoteController < ApplicationController
# <http://www.gnu.org/licenses/>.
class QuickvoteController < ApplicationController
+ helper :sparklines
layout 'main'
require_dependency "quick_voter"
require_dependency "quick_vote"
layout 'main'
require_dependency "quick_voter"
require_dependency "quick_vote"
@@
-94,7
+95,7
@@
class QuickvoteController < ApplicationController
end
end
flash.keep(:candidate_names)
end
end
flash.keep(:candidate_names)
- render
_partial
'candidate_list'
+ render
:partial =>
'candidate_list'
end
#############################################################
end
#############################################################
@@
-160,17
+161,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
@voter.save
- # save the time the vote was made for statistical use
- @voter.vote.time = Time.now
-
# toggle the confirmation bit
# 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
@@
-188,9
+188,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?