merged fixes from devel

[selectricity] / app / views / common / _methodinfo_ssd.rhtml

diff --git a/app/views/common/_methodinfo_ssd.rhtml b/app/views/common/_methodinfo_ssd.rhtml
index 25bc3546c38cd4c4e42e629b5c7ac21bf52351b9..230191ca381c86581fd377c5729bd6cf032fe5ea 100644 (file)
--- a/app/views/common/_methodinfo_ssd.rhtml
+++ b/app/views/common/_methodinfo_ssd.rhtml
@@ -25,13 +25,13 @@ Beatpath Winner, Path Voting, and Path Winner.</p>
 
 <% candidates = @election.ssd_result.ranked_candidates.flatten -%>
 <% if candidates.size <= 7 -%>
 
 <% candidates = @election.ssd_result.ranked_candidates.flatten -%>
 <% if candidates.size <= 7 -%>

-  <%= render_partial 'common/pref_tables' %>
+  <%= render :partial => 'common/pref_tables' %>

 <% else %>
 
   There are too many candidates in your elections to show the result
   tables.
 
 <% else %>
 
   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 %>