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

[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 f53f5cf2806bfc022e10ffed06518095c0fdcf6f..061989586a255b067cdcf94d219feb7d8b06df86 100644 (file)
--- a/app/views/user_blocks/_navigation.html.erb
+++ b/app/views/user_blocks/_navigation.html.erb
@@ -34,11 +34,17 @@
                   :class => ["nav-link", { :active => action_name == "blocks_by" }] %>
     </li>
   <% end %>
                   :class => ["nav-link", { :active => action_name == "blocks_by" }] %>
     </li>
   <% end %>

-  <% if @user_block %>
+  <% if @user_block&.persisted? %>

     <li class="nav-item">
       <%= link_to t(".block", :id => @user_block.id),
                   user_block_path(@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" }] %>
+                  :class => "nav-link active" %>
+    </li>
+  <% elsif @user_block&.new_record? %>
+    <li class="nav-item">
+      <%= link_to t(".new_block"),
+                  new_user_block_path,
+                  :class => "nav-link active" %>

     </li>
   <% end %>
 </ul>
     </li>
   <% end %>
 </ul>