Merge from head

[selectricity] / app / views / quickvote / _pref_tables.rhtml

diff --git a/app/views/quickvote/_pref_tables.rhtml b/app/views/quickvote/_pref_tables.rhtml
index 18e5aa38f81f3cc5d91aa23c76f4d4063fbb585f..628ce55ca5d873474e149fdc4097109cf8512799 100644 (file)
--- a/app/views/quickvote/_pref_tables.rhtml
+++ b/app/views/quickvote/_pref_tables.rhtml
@@ -2,7 +2,6 @@
 <% voters = @election.voters.size %>
 <% matrix = @election.condorcet_result.matrix %>
 <% victories = @election.condorcet_result.victories_and_ties %>
 <% voters = @election.voters.size %>
 <% matrix = @election.condorcet_result.matrix %>
 <% victories = @election.condorcet_result.victories_and_ties %>

-<% names = @election.names_by_id %>

 
 <!-- This table shows how many times each choice was ranked above the other, 
        with percentages-->
 
 <!-- This table shows how many times each choice was ranked above the other, 
        with percentages-->


@@ -10,13 +9,13 @@
   <tr>
        <td></td>
        <% candidates.each do |candidate| -%>
   <tr>
        <td></td>
        <% candidates.each do |candidate| -%>

-         <th><%=h names[candidate] -%></th>
+         <th><%=h @names[candidate] -%></th>

   <% end -%>
  </tr>
 
 <% candidates.each do |winner| -%>
   <tr>
   <% end -%>
  </tr>
 
 <% candidates.each do |winner| -%>
   <tr>

-       <th><%=h names[winner] %></th>
+       <th><%=h @names[winner] %></th>

   <% candidates.each do |loser| -%> 
     <% if winner == loser -%>
       <td> -- </td>
   <% candidates.each do |loser| -%> 
     <% if winner == loser -%>
       <td> -- </td>


@@ -36,10 +35,10 @@
 <table class="preftable">
   <% candidates.each do |victor| %>
   <tr>
 <table class="preftable">
   <% candidates.each do |victor| %>
   <tr>

-    <th><%=h names[victor] %></th>
+    <th><%=h @names[victor] %></th>

        <% victories[victor].keys.each do |loser| %>
        <% margin = victories[victor][loser]%>
        <% victories[victor].keys.each do |loser| %>
        <% margin = victories[victor][loser]%>

-       <td><%=h names[loser] %> 
+       <td><%=h @names[loser] %> 

            <% if margin == 0%>
                  Tied!
                <% else -%>
            <% if margin == 0%>
                  Tied!
                <% else -%>