Merge branch 'master' into openstreetbugs

[rails.git] / app / views / user_blocks / _blocks.html.erb

diff --git a/app/views/user_blocks/_blocks.html.erb b/app/views/user_blocks/_blocks.html.erb
index cdb224c2e36ee44444276531056f3556dfd45412..7127cc283721059a1e4c52b938b0d38a02f0518a 100644 (file)
--- a/app/views/user_blocks/_blocks.html.erb
+++ b/app/views/user_blocks/_blocks.html.erb
@@ -1,4 +1,3 @@
-<% unless @user_blocks.empty? %>

 <table id="block_list" cellpadding="3">
   <tr>
     <% if show_user_name %>
 <table id="block_list" cellpadding="3">
   <tr>
     <% if show_user_name %>


@@ -18,6 +17,3 @@
   </tr>
   <%= render :partial => 'block', :locals => {:show_revoke_link => show_revoke_link, :show_user_name => show_user_name, :show_creator_name => show_creator_name }, :collection => @user_blocks %>
 </table>
   </tr>
   <%= render :partial => 'block', :locals => {:show_revoke_link => show_revoke_link, :show_user_name => show_user_name, :show_creator_name => show_creator_name }, :collection => @user_blocks %>
 </table>

-<% else %>
-<p><%= t "user_block.#{blocks_by_on}.empty", :name => h(@this_user.display_name) %></p>
-<% end %>