Display same in hostname and IP when IP lookup fails

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

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index 5fdfc3c49624aae03bebe9f91eeab9e09e6deed3..9677d9ac0ae307e2ab7d102da2827b5e4a516220 100644 (file)
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -1,4 +1,4 @@
-<% %>
+<%require 'IPAddr' %>

 <h1>Results</h1>
 
 <% if @election.shortdesc %>
 <h1>Results</h1>
 
 <% if @election.shortdesc %>


@@ -28,7 +28,7 @@
 
 <div class="mainresultbox">
 <h3>Schulze Method Results</h3>
 
 <div class="mainresultbox">
 <h3>Schulze Method Results</h3>

-<%= render :partial => 'result', :object => @ssd_result %>
+<%= render :partial => 'result', :object => @election.ssd_result %>

 
 <div class="rbmoreinfo"
 <h4>About the Schulze Method</h4>
 
 <div class="rbmoreinfo"
 <h4>About the Schulze Method</h4>


@@ -47,7 +47,7 @@ Beatpath Winner, Path Voting, and Path Winner.</p>
 
 <div class="resultbox">
 <h3>Plurality Results</h3>
 
 <div class="resultbox">
 <h3>Plurality Results</h3>

-<%= render :partial => 'result', :object => @plurality_result %>
+<%= render :partial => 'result', :object => @election.plurality_result %>

 
 <div class="rbmoreinfo"
 <h4>About Plurality Voting</h4>
 
 <div class="rbmoreinfo"
 <h4>About Plurality Voting</h4>


@@ -67,7 +67,7 @@ voting.</p>
 <div class="resultbox">
 <h3>Approval Result</h3>
 <p><font size="-1">(This algorithm assumes that top two choices are "approved.")</font></p>
 <div class="resultbox">
 <h3>Approval Result</h3>
 <p><font size="-1">(This algorithm assumes that top two choices are "approved.")</font></p>

-<%= render :partial => 'result', :object => @approval_result %>
+<%= render :partial => 'result', :object => @election.approval_result %>

 
 <div class="rbmoreinfo"
 <h4>About Approval Voting</h4>
 
 <div class="rbmoreinfo"
 <h4>About Approval Voting</h4>


@@ -85,7 +85,7 @@ accept or not.</p>
 
 <div class="resultbox">
 <h3>Simple Condorcet Results</h3>
 
 <div class="resultbox">
 <h3>Simple Condorcet Results</h3>

-<%= render :partial => 'result', :object => @condorcet_result %>
+<%= render :partial => 'result', :object => @election.condorcet_result %>

 
 <div class="rbmoreinfo"
 <h4>About Simple Cordorcet Voting</h4>
 
 <div class="rbmoreinfo"
 <h4>About Simple Cordorcet Voting</h4>


@@ -105,7 +105,7 @@ another Condorcet system.</p>
 
 <div class="resultbox">
 <h3>Borda Count Results</h3>
 
 <div class="resultbox">
 <h3>Borda Count Results</h3>

-<%= render :partial => 'result', :object => @borda_result %>
+<%= render :partial => 'result', :object => @election.borda_result %>

 
 <div class="rbmoreinfo"
 <h4>About Borda Count</h4>
 
 <div class="rbmoreinfo"
 <h4>About Borda Count</h4>


@@ -156,7 +156,13 @@ by several other names.</p>
   <% next unless voter.voted? %>
   <tr>
   <td><%= voter.ipaddress %></td>
   <% next unless voter.voted? %>
   <tr>
   <td><%= voter.ipaddress %></td>

-  <td><%= `host #{voter.ipaddress}`.sub(/^.*pointer (.*)\.$/, '\1') %></td>
+  <td><% begin %>
+      <%= `host #{IPAddr.new(voter.ipaddress).to_s}`.sub(/^.*pointer (.*)\.$/, '\1') %>
+    
+    <% rescue ArgumentError => err %>
+      <%= voter.ipaddress %>
+    <% end %>
+    </td>

   <td><%= voter.vote.votestring %></td>
   </tr>
 <% end %>
   <td><%= voter.vote.votestring %></td>
   </tr>
 <% end %>


@@ -164,6 +170,6 @@ by several other names.</p>
 
 <%= image_tag( graph_url( :action => 'votes_per_day', :id => @election ) ) %><br />
 <%= image_tag( graph_url( :action => 'votes_per_interval', :id => @election ))%><br />
 
 <%= image_tag( graph_url( :action => 'votes_per_day', :id => @election ) ) %><br />
 <%= image_tag( graph_url( :action => 'votes_per_interval', :id => @election ))%><br />

-<%= image_tag( graph_url( :action => 'borda_bar', :id => @election ) ) %>
-
+<%= image_tag( graph_url( :action => 'borda_bar', :id => @election ) ) %><br />
+<%= image_tag( graph_url( :action => 'choices_positions', :id => @election ) ) %>