fixed errors with election/class

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index 5c13a8128cdfa6781240bc6b9937d0e533482afd..ccbbafe282bb2add4fc809c246f69a60b6bb04fb 100644 (file)
--- a/app/controllers/election_controller.rb
+++ b/app/controllers/election_controller.rb
@@ -160,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
       

diff --git a/app/views/common/_methodinfo_condorcet.rhtml b/app/views/common/_methodinfo_condorcet.rhtml
index 743dd455fd672d50198b25626863f6e55f73d856..b941eea258158ab9657b23423796b64d909fac39 100644 (file)
--- a/app/views/common/_methodinfo_condorcet.rhtml
+++ b/app/views/common/_methodinfo_condorcet.rhtml
@@ -19,7 +19,7 @@ another Condorcet system.</p>
   There are too many candidates in your elections to show the result
   tables. 
 
   There are too many candidates in your elections to show the result
   tables. 
 

-  <% if not @election.type == QuickVote %>
+  <% if not @election.class == QuickVote %>

     <%= link_to "Click here", { :action => 'pref_tables', :id => @voter.password }, :popup => [] %>
     to view details.
   <% end %>
     <%= link_to "Click here", { :action => 'pref_tables', :id => @voter.password }, :popup => [] %>
     to view details.
   <% end %>

diff --git a/app/views/common/_methodinfo_ssd.rhtml b/app/views/common/_methodinfo_ssd.rhtml
index 00f9febe01d0270a57a13c5b840a5c4bd06bfe24..230191ca381c86581fd377c5729bd6cf032fe5ea 100644 (file)
--- a/app/views/common/_methodinfo_ssd.rhtml
+++ b/app/views/common/_methodinfo_ssd.rhtml
@@ -31,7 +31,7 @@ Beatpath Winner, Path Voting, and Path Winner.</p>
   There are too many candidates in your elections to show the result
   tables.
 
   There are too many candidates in your elections to show the result
   tables.
 

-  <% if not @election.type == QuickVote %>
+  <% if not @election.class == QuickVote %>

     <%= link_to "Click here", { :action => 'pref_tables', :id => @voter.password }, :popup => [] %>
     to view details.
   <% end %>
     <%= link_to "Click here", { :action => 'pref_tables', :id => @voter.password }, :popup => [] %>
     to view details.
   <% end %>