fix weird bug with showing results from open elections

[selectricity] / app / controllers / election_controller.rb

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index be2fb3d2c9efd26c5deb6e8ee150249b5e509ac2..3d811e622112f32ab59b6c5fc075a5a21d9c60da 100644 (file)
--- a/app/controllers/election_controller.rb
+++ b/app/controllers/election_controller.rb
@@ -45,6 +45,7 @@ class ElectionController < ApplicationController
     @election.user = session[:user]
     @election.anonymous = 1
     @election.startdate = Time.now
     @election.user = session[:user]
     @election.anonymous = 1
     @election.startdate = Time.now

+    @election.type = 'Election'

     
     holder = create_theme_hash
     unless holder.values.all? {|v| v.has_value?("")}
     
     holder = create_theme_hash
     unless holder.values.all? {|v| v.has_value?("")}


@@ -159,7 +160,7 @@ class ElectionController < ApplicationController
                                         :locals => { :page => 'review' }
 
     @election = Election.find(params[:id])
                                         :locals => { :page => 'review' }
 
     @election = Election.find(params[:id])

-    if @election.type == QuickVote
+    if @election.class  == QuickVote

       redirect_to(:controller => 'quickvote', :action => 'index', :ident => @election.id)
     end
       
       redirect_to(:controller => 'quickvote', :action => 'index', :ident => @election.id)
     end
       


@@ -233,11 +234,12 @@ class ElectionController < ApplicationController
     if params.has_key?( :raw_voter_list )
       process_incoming_voters( params[:raw_voter_list] )
     end
     if params.has_key?( :raw_voter_list )
       process_incoming_voters( params[:raw_voter_list] )
     end

+    @edit = true

     @raw_voter_list = RawVoterList.new
   end
   
   def delete_voter
     @raw_voter_list = RawVoterList.new
   end
   
   def delete_voter

-    voter = Voter.find( params[:id] )
+    voter = FullVoter.find( params[:id] )

     voter.destroy
   end
 
     voter.destroy
   end