merged in from code from the other master

[selectricity] / app / views / election / _voter_list.rhtml

diff --git a/app/views/election/_voter_list.rhtml b/app/views/election/_voter_list.rhtml
old mode 100755 (executable)
new mode 100644 (file)
index c55afdb..34aa207
--- a/app/views/election/_voter_list.rhtml
+++ b/app/views/election/_voter_list.rhtml
@@ -1,18 +1,20 @@
-<% %>
-
 <% if @election.voters.length == 0 %>
+
 <p>There are currently no voters registered for this election.</p>
+
 <% else %>
+
 <p>The following voters are currently registered for this election:</p>
 
 <ul>
-  <% @election.voters.each do |voter| %>
+<% @election.voters.each do |voter| %>
   <div id="voter<%= voter.id %>">
     <li><%= voter.email %>
         <% if @edit %>
         <%= link_to_remote "Delete",
                     :complete => "Element.remove('voter#{voter.id}')",
-                    :url => { :action => :delete_voter, :id => voter.id } %>
+                    :url => { :action => :delete_voter, :id => @election.id,
+                              :voter => voter.id } %>
         <% end %>
     </li>
   </div>