Merge remote branch 'remotes/deployment/master' into live

[selectricity-live] / app / controllers / quickvote_controller.rb

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index 768bdea261ba28000363e25e4da6d3c24b61e7e9..c32d585dd53cc441d8e36d7a72fe74be9edaec90 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
+  helper :sparklines
   layout 'main'
   require_dependency "quick_voter"
   require_dependency "quick_vote"
@@ -94,7 +95,7 @@ class QuickvoteController < ApplicationController
       end
     end
     flash.keep(:candidate_names)
-    render_partial 'candidate_list'
+    render :partial => 'candidate_list'
   end
  
   #############################################################
@@ -163,9 +164,6 @@ class QuickvoteController < ApplicationController
       @voter.ipaddress = request.env["REMOTE_ADDR"]
       @voter.save
       
-      # save the time the vote was made for statistical use
-      @voter.vote.time = Time.now
-      
       # toggle the confirmation bit      
       @voter.vote.confirm!