Created a partial to DRY the aja voting method. Modified the voter class to

[selectricity] / app / controllers / voter_controller.rb

diff --git a/app/controllers/voter_controller.rb b/app/controllers/voter_controller.rb
index f4e0e7e7d782e9d67c13518d15758f616b8c9764..6693b0fa6baa9090cfa6c72b146a240f3d95024e 100644 (file)
--- a/app/controllers/voter_controller.rb
+++ b/app/controllers/voter_controller.rb
@@ -8,22 +8,17 @@ class VoterController < ApplicationController
     password = params[:id]
     password = params[:vote][:password] if params[:vote]
     if @voter = FullVoter.find(:all, :conditions => [ "password = ?", password ] )[0]
-      render :action => 'fullvote'
+      @voter.vote = Vote.new if @voter.vote.nil?
+      @voter.vote.set_defaults! if @voter.vote.rankings.empty?
+      render :action => 'full_vote'
     end
   end
   
   def review
     if authenticate
-      # remove any existing votes and reload
-      if @voter.vote
-        @voter.vote.destroy
-        @voter.reload
-      end
-    
-      @vote = Vote.new
-      @voter.vote = @vote
-      @vote.votestring = params[:vote][:votestring] 
-      @vote.save
+      @voter.vote.time = Time.now
+      @voter.vote.save
+      @voter.reload
     else
       redirect_to :action => 'index'
     end