minor fixes to the templates

[selectricity] / app / controllers / voter_controller.rb

diff --git a/app/controllers/voter_controller.rb b/app/controllers/voter_controller.rb
index 252711830ac96f7796062b7ab523cf391ed1eab3..fb1bec7a0f69f84b1063b6e936722763d022b8f3 100644 (file)
--- a/app/controllers/voter_controller.rb
+++ b/app/controllers/voter_controller.rb
@@ -1,28 +1,24 @@
 class VoterController < ApplicationController
 class VoterController < ApplicationController

-  model :voter
-  model :vote
-  model :election
+  layout 'main'
+  require_dependency "voter"
+  require_dependency "vote"
+  require_dependency "election"

 
   def index
     password = params[:id]
     password = params[:vote][:password] if params[:vote]
 
   def index
     password = params[:id]
     password = params[:vote][:password] if params[:vote]

-    if @voter = Voter.find_all( [ "password = ?", password ] )[0]
-      render :action => 'vote'
+    if @voter = FullVoter.find(:all, :conditions => [ "password = ?", password ] )[0]
+      @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
     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
     else
       redirect_to :action => 'index'
     end


@@ -36,10 +32,11 @@ class VoterController < ApplicationController
       redirect_to :action => 'index'
     end
   end
       redirect_to :action => 'index'
     end
   end

-
+  

   private
   def authenticate
     password = params[:id]
   private
   def authenticate
     password = params[:id]

-    @voter = Voter.find_all( [ "password = ?", password ] )[0]
+    @voter = FullVoter.find(:all, :conditions => [ "password = ?", password ] )[0]

   end
 end
   end
 end

+