From: John Dong <jdong@mit.edu>
Date: Wed, 15 Aug 2007 21:59:40 +0000 (-0400)
Subject: Merge from jdong
X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/b717fb1eab4f06d25f195a74c71806484ce0fd57?hp=924aa1ff433ac4ccd2db5851e91038088be00a09

Merge from jdong
---

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index 5626636..3b3a54d 100644
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -159,7 +159,7 @@ by several other names.</p>
       <%= `host #{IPAddr.new(voter.ipaddress).to_s}`.sub(/^.*pointer (.*)\.$/, '\1') %>
     
     <% rescue ArgumentError => err %>
-      <%= " - " %>
+      <%= voter.ipaddress %>
     <% end %>
     </td>
   <td><%= voter.vote.votestring %></td>
diff --git a/lib/rubyvote/election.rb b/lib/rubyvote/election.rb
index efb8dd8..ffd31c8 100644
--- a/lib/rubyvote/election.rb
+++ b/lib/rubyvote/election.rb
@@ -152,7 +152,7 @@ class PluralityResult < ElectionResult
       b[1] <=> a[1]
     end.collect {|a| a[0]}
     
-    @points = self.election.votes
+    @points = @election.votes
     
     # winners are anyone who has the same number of votes as the
     # first person
diff --git a/lib/rubyvote/positional.rb b/lib/rubyvote/positional.rb
index dc0b63a..056194b 100644
--- a/lib/rubyvote/positional.rb
+++ b/lib/rubyvote/positional.rb
@@ -78,7 +78,7 @@ class BordaResult < ElectionResult
       votes[i] == votes[@ranked_candidates[0]]
     end
     
-    @points = self.election.votes
+    @points = @election.votes
   end
 
 end