From 137468f75f23d41092884e597fe2006e38a3cccd Mon Sep 17 00:00:00 2001
From: Matt Amos <zerebubuth@gmail.com>
Date: Tue, 6 Oct 2009 14:19:54 +0000
Subject: [PATCH] Fixed bug in _blocks partial when used by the index view.

---
 app/views/user_blocks/_blocks.html.erb   | 4 ----
 app/views/user_blocks/blocks_by.html.erb | 6 +++++-
 app/views/user_blocks/blocks_on.html.erb | 6 +++++-
 app/views/user_blocks/index.html.erb     | 4 ++++
 config/locales/en.yml                    | 1 +
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/app/views/user_blocks/_blocks.html.erb b/app/views/user_blocks/_blocks.html.erb
index cdb224c2e..7127cc283 100644
--- 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 %>
@@ -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>
-<% else %>
-<p><%= t "user_block.#{blocks_by_on}.empty", :name => h(@this_user.display_name) %></p>
-<% end %>
diff --git a/app/views/user_blocks/blocks_by.html.erb b/app/views/user_blocks/blocks_by.html.erb
index 1a910001f..c9158536b 100644
--- a/app/views/user_blocks/blocks_by.html.erb
+++ b/app/views/user_blocks/blocks_by.html.erb
@@ -1,4 +1,8 @@
 <% @title = t('user_block.blocks_by.title', :name => h(@this_user.display_name)) %>
 <h1><%= t('user_block.blocks_by.heading', :name => link_to(h(@this_user.display_name), {:controller => 'user', :action => 'view', :display_name => @this_user.display_name})) %></h1>
 
-<%= render :partial => 'blocks', :locals => { :blocks_by_on => 'blocks_by', :show_revoke_link => (@user and @user.moderator?), :show_user_name => true, :show_creator_name => false } %>
+<% unless @user_blocks.empty? %>
+<%= render :partial => 'blocks', :locals => { :show_revoke_link => (@user and @user.moderator?), :show_user_name => true, :show_creator_name => false } %>
+<% else %>
+<p><%= t "user_block.blocks_by.empty", :name => h(@this_user.display_name) %></p>
+<% end %>
diff --git a/app/views/user_blocks/blocks_on.html.erb b/app/views/user_blocks/blocks_on.html.erb
index 9a2b8bc5f..2074af433 100644
--- a/app/views/user_blocks/blocks_on.html.erb
+++ b/app/views/user_blocks/blocks_on.html.erb
@@ -1,4 +1,8 @@
 <% @title = t('user_block.blocks_on.title', :name => h(@this_user.display_name)) %>
 <h1><%= t('user_block.blocks_on.heading', :name => link_to(h(@this_user.display_name), {:controller => 'user', :action => 'view', :display_name => @this_user.display_name})) %></h1>
 
-<%= render :partial => 'blocks', :locals => { :blocks_by_on => 'blocks_on', :show_revoke_link => (@user and @user.moderator?), :show_user_name => false, :show_creator_name => true } %>
+<% unless @user_blocks.empty? %>
+<%= render :partial => 'blocks', :locals => { :show_revoke_link => (@user and @user.moderator?), :show_user_name => false, :show_creator_name => true } %>
+<% else %>
+<p><%= t "user_block.blocks_on.empty", :name => h(@this_user.display_name) %></p>
+<% end %>
diff --git a/app/views/user_blocks/index.html.erb b/app/views/user_blocks/index.html.erb
index 8d645f465..2baf91e5f 100644
--- a/app/views/user_blocks/index.html.erb
+++ b/app/views/user_blocks/index.html.erb
@@ -1,4 +1,8 @@
 <% @title = t('user_block.index.title') %>
 <h1><%= t('user_block.index.heading') %></h1>
 
+<% unless @user_blocks.empty? %>
 <%= render :partial => 'blocks', :locals => { :show_revoke_link => (@user and @user.moderator?), :show_user_name => true, :show_creator_name => true } %>
+<% else %>
+<p><%= t "user_block.index.empty" %></p>
+<% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fabfba040..f8a424b45 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1073,6 +1073,7 @@ en:
     index:
       title: "User blocks"
       heading: "List of user blocks"
+      empty: "No blocks have been made yet."
     revoke:
       title: "Revoking block on {{block_on}}"
       heading: "Revoking block on {{block_on}} by {{block_by}}"
-- 
2.45.1