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 5ec8b89e6c24ced67b5b0ebd4eefdf25d83c6522..230191ca381c86581fd377c5729bd6cf032fe5ea 100644 (file)
--- a/app/views/common/_methodinfo_ssd.rhtml
+++ b/app/views/common/_methodinfo_ssd.rhtml
@@ -25,12 +25,16 @@ 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
 <% else %>
 
   There are too many candidates in your elections to show the result

-  tables.  <%= link_to "Click here", { :action => 'pref_tables', :id =>
-  @voter.password }, :popup => [] %> to view details.
+  tables.
+
+  <% if not @election.class == QuickVote %>
+    <%= link_to "Click here", { :action => 'pref_tables', :id => @voter.password }, :popup => [] %>
+    to view details.
+  <% end %>

 
 <% end -%>
 
 
 <% end -%>