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.

Fix MenuItems Tree.

Matthew Kennedyb4d98c4c7e10
diff --git a/backend/app/controllers/spree/admin/menus_controller.rb b/backend/app/controllers/spree/admin/menus_controller.rb
index 4c55368d89..28ab2d169b 100644
--- a/backend/app/controllers/spree/admin/menus_controller.rb
+++ b/backend/app/controllers/spree/admin/menus_controller.rb
@@ -2,6 +2,7 @@ module Spree
module Admin
class MenusController < ResourceController
before_action :load_data
+ before_action :load_menu_items_ordered, only: :edit
def index; end
@@ -11,9 +12,15 @@ module Spree
spree.edit_admin_menu_path(@menu)
end
+ private
+
def load_data
@stores = Spree::Store.all
end
+
+ def load_menu_items_ordered
+ @menu_items_in_order = @menu.menu_items.order('lft ASC')
+ end
end
end
end
diff --git a/backend/app/helpers/spree/admin/menu_helper.rb b/backend/app/helpers/spree/admin/menu_helper.rb
index 03d938144b..6829cc9a13 100644
--- a/backend/app/helpers/spree/admin/menu_helper.rb
+++ b/backend/app/helpers/spree/admin/menu_helper.rb
@@ -19,10 +19,16 @@ module Spree
end
def menu_item_that_accepts_nested_items(menu, item)
- decendents = build_menu_item(menu, item.children[0]) unless item.leaf?
+ decendents = []
+
+ unless item.leaf?
+ item.children.each do |x|
+ decendents << build_menu_item(menu, x) unless item.leaf?
+ end
+ end
info_row = menu_item_bar(menu, item)
- sub_menu_container = content_tag(:div, decendents, class: 'menu-container', data: { parent_id: item.id })
+ sub_menu_container = content_tag(:div, raw(decendents.join), class: 'menu-container', data: { parent_id: item.id })
content_tag(:div, info_row + sub_menu_container, class: 'menu-item menu-container-item dragable', data: { item_id: item.id })
end
diff --git a/backend/app/views/spree/admin/menu_items/_form.html.erb b/backend/app/views/spree/admin/menu_items/_form.html.erb
index 67821854b2..f38ffccb26 100644
--- a/backend/app/views/spree/admin/menu_items/_form.html.erb
+++ b/backend/app/views/spree/admin/menu_items/_form.html.erb
@@ -15,6 +15,9 @@
<div class="alert alert-info mt-3 mb-0">
<%= raw Spree.t('admin.navigation.menu_item_type_message') %>
</div>
+
+ <hr>
+ <%= f.select :parent_id, nested_set_options(Spree::MenuItem, @menu_item) {|i| "#{'-' * i.level} #{i.name}" }, {include_blank: true}, {class: 'select2-clear'} %>
</div>
</div>
</div>
diff --git a/backend/app/views/spree/admin/menus/edit.html.erb b/backend/app/views/spree/admin/menus/edit.html.erb
index 7bd92d5f5a..655a498fb9 100644
--- a/backend/app/views/spree/admin/menus/edit.html.erb
+++ b/backend/app/views/spree/admin/menus/edit.html.erb
@@ -38,7 +38,7 @@
<div class="card-body p-0 bg-light">
<div id="primaryMenuContainer" class="menu-container">
- <% nested_set_options(@menu.menu_items) do |item| %>
+ <% nested_set_options(@menu_items_in_order) do |item| %>
<% if item.root? %>
<%= build_menu_item(@menu, item) %>
<% end %>