Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Admin: use render collection to render nav items

Damian Legawiec5722b3a6c0ee
diff --git a/admin/app/views/spree/admin/shared/_navigation.html.erb b/admin/app/views/spree/admin/shared/_navigation.html.erb
index 735785b0f7..96944d427f 100644
--- a/admin/app/views/spree/admin/shared/_navigation.html.erb
+++ b/admin/app/views/spree/admin/shared/_navigation.html.erb
@@ -1,5 +1,3 @@
<ul class="nav flex-col">
- <% items.each do |item| %>
- <%= render 'spree/admin/shared/navigation_item', item: item, context: context %>
- <% end %>
+ <%= render collection: items, partial: 'spree/admin/shared/navigation_item', as: :item, locals: { context: context } %>
</ul>
diff --git a/admin/app/views/spree/admin/shared/_navigation_item.html.erb b/admin/app/views/spree/admin/shared/_navigation_item.html.erb
index bc2d3fb4bf..0279913349 100644
--- a/admin/app/views/spree/admin/shared/_navigation_item.html.erb
+++ b/admin/app/views/spree/admin/shared/_navigation_item.html.erb
@@ -43,9 +43,7 @@
<%# Submenu for expanded sidebar (only shown when active) %>
<ul class="nav-submenu <% unless is_active %>hidden<% end %>" id="nav-submenu-<%= item.key %>">
- <% item.children.select { |child| child.visible?(self) }.each do |child_item| %>
- <%= render 'spree/admin/shared/navigation_item', item: child_item, context: context %>
- <% end %>
+ <%= render collection: item.children.select { |child| child.visible?(self) }, partial: 'spree/admin/shared/navigation_item', as: :item, locals: { context: context } %>
</ul>
<%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>
@@ -53,9 +51,7 @@
<%# Add parent item as first item in dropdown %>
<%= nav_item(item_label, item_url, icon: nil) %>
- <% item.children.select { |child| child.visible?(self) }.each do |child_item| %>
- <%= render 'spree/admin/shared/navigation_item', item: child_item, context: context %>
- <% end %>
+ <%= render collection: item.children.select { |child| child.visible?(self) }, partial: 'spree/admin/shared/navigation_item', as: :item, locals: { context: context } %>
</ul>
<% else %>
<%# Regular item without children %>