updated and moved ignore file

[selectricity] / app / controllers / quickvote_controller.rb

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index fbf53d3f0f3347e06c18dc61ec92a42a27f6f5fa..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
 # <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
  
   #############################################################


@@ -138,6 +139,7 @@ class QuickvoteController < ApplicationController
   end
 
   def confirm
   end
 
   def confirm

+    

     # we need the election to verify that we have the right voter
     election = QuickVote.ident_to_quickvote(params[:ident])
 
     # we need the election to verify that we have the right voter
     election = QuickVote.ident_to_quickvote(params[:ident])
 


@@ -145,7 +147,7 @@ class QuickvoteController < ApplicationController
     @voter = QuickVoter.find(:all,
       :conditions => ["session_id = ? and election_id = ?", 
                       session.session_id, election.id])[0]
     @voter = QuickVoter.find(:all,
       :conditions => ["session_id = ? and election_id = ?", 
                       session.session_id, election.id])[0]

-  
+   

     if not @voter
       # we have not seen this  voter before. something is wrong, try
       # again
     if not @voter
       # we have not seen this  voter before. something is wrong, try
       # again


@@ -162,9 +164,6 @@ class QuickvoteController < ApplicationController
       @voter.ipaddress = request.env["REMOTE_ADDR"]
       @voter.save
       
       @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!
      
       # toggle the confirmation bit      
       @voter.vote.confirm!