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

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

diff --git a/app/views/user_blocks/_navigation.html.erb b/app/views/user_blocks/_navigation.html.erb
index b7cc19ecfeaee5ae5c6bb9416c408c73c98d1b2a..f53f5cf2806bfc022e10ffed06518095c0fdcf6f 100644 (file)
--- a/app/views/user_blocks/_navigation.html.erb
+++ b/app/views/user_blocks/_navigation.html.erb
@@ -11,6 +11,14 @@
                   :class => ["nav-link", { :active => action_name == "blocks_on" && current_user == @user }] %>
     </li>
   <% end %>
                   :class => ["nav-link", { :active => action_name == "blocks_on" && current_user == @user }] %>
     </li>
   <% end %>

+  <% on_user = @user || @user_block&.user %>
+  <% if on_user != current_user && on_user&.blocks&.exists? %>
+    <li class="nav-item">
+      <%= link_to t(".blocks_on_user", :user => on_user.display_name),
+                  user_blocks_on_path(on_user),
+                  :class => ["nav-link", { :active => action_name == "blocks_on" }] %>
+    </li>
+  <% end %>

   <% if current_user&.blocks_created&.exists? %>
     <li class="nav-item">
       <%= link_to t(".blocks_by_me"),
   <% if current_user&.blocks_created&.exists? %>
     <li class="nav-item">
       <%= link_to t(".blocks_by_me"),


@@ -18,4 +26,19 @@
                   :class => ["nav-link", { :active => action_name == "blocks_by" && current_user == @user }] %>
     </li>
   <% end %>
                   :class => ["nav-link", { :active => action_name == "blocks_by" && current_user == @user }] %>
     </li>
   <% end %>

+  <% by_user = @user || @user_block&.creator %>
+  <% if by_user != current_user && by_user&.blocks_created&.exists? %>
+    <li class="nav-item">
+      <%= link_to t(".blocks_by_user", :user => by_user.display_name),
+                  user_blocks_by_path(by_user),
+                  :class => ["nav-link", { :active => action_name == "blocks_by" }] %>
+    </li>
+  <% end %>
+  <% if @user_block %>
+    <li class="nav-item">
+      <%= link_to t(".block", :id => @user_block.id),
+                  user_block_path(@user_block),
+                  :class => ["nav-link", { :active => action_name == "show" }] %>
+    </li>
+  <% end %>

 </ul>
 </ul>