Merge remote-tracking branch 'upstream/pull/5110'

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

diff --git a/app/views/user_blocks/_block.html.erb b/app/views/user_blocks/_block.html.erb
index b309e9e119bd661b023b05fc2a5d537739b91dd7..1eb38f93fc50b285b7a6a66a335de94a5bded882 100644 (file)
--- a/app/views/user_blocks/_block.html.erb
+++ b/app/views/user_blocks/_block.html.erb
@@ -1,9 +1,9 @@
 <tr>
 <tr>

-  <% if show_user_name %>
-  <td><%= link_to block.user.display_name, user_path(block.user) %></td>
+  <% if @show_user_name %>
+  <td><%= link_to block.user.display_name, block.user, :class => "username d-inline-block text-truncate text-wrap" %></td>

   <% end %>
   <% end %>

-  <% if show_creator_name %>
-  <td><%= link_to block.creator.display_name, user_path(block.creator) %></td>
+  <% if @show_creator_name %>
+  <td><%= link_to block.creator.display_name, block.creator, :class => "username d-inline-block text-truncate text-wrap" %></td>

   <% end %>
   <td><%= h truncate(block.reason) %></td>
   <td><%= h block_status(block) %></td>
   <% end %>
   <td><%= h truncate(block.reason) %></td>
   <td><%= h block_status(block) %></td>


@@ -11,12 +11,9 @@
     <% if block.revoker_id.nil? %>
       <%= t(".not_revoked") %>
     <% else %>
     <% if block.revoker_id.nil? %>
       <%= t(".not_revoked") %>
     <% else %>

-      <%= link_to block.revoker.display_name, user_path(block.revoker) %>
+      <%= link_to block.revoker.display_name, block.revoker %>

     <% end %>
   </td>
   <td><%= link_to t(".show"), block %></td>
     <% end %>
   </td>
   <td><%= link_to t(".show"), block %></td>

-  <td><% if current_user and current_user.id == block.creator_id and block.active? %><%= link_to t(".edit"), edit_user_block_path(block) %><% end %></td>
-  <% if show_revoke_link %>
-  <td><% if block.active? %><%= link_to t(".revoke"), :controller => "user_blocks", :action => "revoke", :id => block.id %><% end %></td>
-  <% end %>
+  <td><% if can?(:edit, block) %><%= link_to t(".edit"), edit_user_block_path(block) %><% end %></td>

 </tr>
 </tr>