X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/1620856a8a47219f3a2cbb5288137b11467886fc..d54ad8e9ed307bf42fd325775fd2b350802847b3:/app/controllers/voter_controller.rb

diff --git a/app/controllers/voter_controller.rb b/app/controllers/voter_controller.rb
index e94f4a7..fb1bec7 100644
--- a/app/controllers/voter_controller.rb
+++ b/app/controllers/voter_controller.rb
@@ -1,29 +1,24 @@
 class VoterController < ApplicationController
   layout 'main'
-  model :voter
-  model :vote
-  model :election
+  require_dependency "voter"
+  require_dependency "vote"
+  require_dependency "election"
 
   def index
     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
@@ -37,7 +32,7 @@ class VoterController < ApplicationController
       redirect_to :action => 'index'
     end
   end
-
+  
   private
   def authenticate
     password = params[:id]