Merge remote branch 'remotes/deployment/master' into live

[selectricity-live] / app / views / common / _methodinfo_condorcet.rhtml

diff --git a/app/views/common/_methodinfo_condorcet.rhtml b/app/views/common/_methodinfo_condorcet.rhtml
index 5fb29e05fc22f33e0f0bf9e47da2e70599099a3d..b941eea258158ab9657b23423796b64d909fac39 100644 (file)
--- a/app/views/common/_methodinfo_condorcet.rhtml
+++ b/app/views/common/_methodinfo_condorcet.rhtml
@@ -13,12 +13,17 @@ another Condorcet system.</p>
 
 <% 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.  <%= 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 -%>