Merge head

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

diff --git a/app/views/quickvote/_result_box.rhtml b/app/views/quickvote/_result_box.rhtml
index 41d9d173532773edf1ecb086820687be4597ed34..917dbd4eea590d0ecbdec4da97361428e8783069 100644 (file)
--- a/app/views/quickvote/_result_box.rhtml
+++ b/app/views/quickvote/_result_box.rhtml
@@ -9,8 +9,11 @@
   <% end %></span>
 </div>
 
   <% end %></span>
 </div>
 

+<% unless @election.election_method == method -%>
+<%= render :partial => 'result', :object => @results[method]%>
+<% end -%>

 <%= render :partial => 'methodinfo_' + method,
 <%= render :partial => 'methodinfo_' + method,

-           :object => @results[@election.election_method] %>
+           :object => @results[method] %>

 
 </div>
 
 
 </div>