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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Sync menu name to root item name, allowing user to get menu name with spree_menu('footer').name
Matthew Kennedyb68f260e8413
diff --git a/core/app/models/spree/menu.rb b/core/app/models/spree/menu.rbindex 038af94a88..fb8be5d5c8 100644--- a/core/app/models/spree/menu.rb+++ b/core/app/models/spree/menu.rb@@ -15,6 +15,7 @@ module Spreebefore_validation :paremeterize_locationafter_create :set_root+ after_save :update_root_namevalidates :name, :store, :locale, presence: truevalidates :location, uniqueness: { scope: [:store, :locale] }@@ -40,5 +41,9 @@ module Spreedef set_rootself.root ||= MenuItem.create!(menu_id: id, name: name, item_type: 'Container')end++ def update_root_name+ root.update(name: name)+ endendenddiff --git a/core/db/migrate/20210407200948_create_spree_menus.rb b/core/db/migrate/20210407200948_create_spree_menus.rbindex 9d82fffa74..02244146bd 100644--- a/core/db/migrate/20210407200948_create_spree_menus.rb+++ b/core/db/migrate/20210407200948_create_spree_menus.rb@@ -10,8 +10,7 @@ class CreateSpreeMenus < ActiveRecord::Migration[6.0]t.timestampsend- add_index :spree_menus, :name- add_index :spree_menus, :locationadd_index :spree_menus, :locale+ add_index :spree_menus, [:store_id, :location, :locale], unique: trueendenddiff --git a/frontend/app/helpers/spree/navigation_helper.rb b/frontend/app/helpers/spree/navigation_helper.rbindex 8c13c3f1f5..028269da6d 100644--- a/frontend/app/helpers/spree/navigation_helper.rb+++ b/frontend/app/helpers/spree/navigation_helper.rb@@ -37,9 +37,12 @@ module Spree)end- def should_render_internationalization_dropdown?- (defined?(should_render_locale_dropdown?) && should_render_locale_dropdown?) ||- (defined?(should_render_currency_dropdown?) && should_render_currency_dropdown?)+ def spree_menu(location = 'header')+ method_name = "for_#{location}"++ if available_menus.respond_to?(method_name) && Spree::Menu::MENU_LOCATIONS_PARAMETERIZED.include?(location)+ available_menus.send(method_name, I18n.locale)+ endenddef spree_localized_item_link(item)diff --git a/frontend/app/views/spree/shared/_footer.html.erb b/frontend/app/views/spree/shared/_footer.html.erbindex 516cee613b..5946bc2cc4 100644--- a/frontend/app/views/spree/shared/_footer.html.erb+++ b/frontend/app/views/spree/shared/_footer.html.erb@@ -49,8 +49,8 @@</div><div class="row d-none d-xl-flex border-top py-5 text-uppercase footer-spree-menu-links">- <% if available_menus.for_footer(I18n.locale).present? %>- <% available_menus.for_header(I18n.locale).children.each do |parent| %>+ <% if spree_menu('footer').present? %>+ <% spree_menu('footer').children.each do |parent| %><div class="col-3"><div class="footer-spree-label"><%= link_to parent.name, spree_localized_item_link(parent) %>diff --git a/frontend/app/views/spree/shared/_main_nav_bar.html.erb b/frontend/app/views/spree/shared/_main_nav_bar.html.erbindex 242a69c110..14201f6832 100644--- a/frontend/app/views/spree/shared/_main_nav_bar.html.erb+++ b/frontend/app/views/spree/shared/_main_nav_bar.html.erb@@ -1,10 +1,10 @@-<% if available_menus.for_header(I18n.locale).present? %>+<% if spree_menu('header').present? %><% category = 'category' %><% promo = 'promo' %><div class="h-100" role="navigation" aria-label="<%= Spree.t('nav_bar.desktop') %>"><ul class="nav h-100 main-nav-bar">- <% available_menus.for_header(I18n.locale).children.each do |parent| %>+ <% spree_menu('header').children.each do |parent| %><li class="p-0 nav-item main-nav-bar-category"><% has_dropdown = parent.children.present? %><% dropdown_toggle_class = has_dropdown ? "dropdown-toggle" : "" %>diff --git a/frontend/app/views/spree/shared/_mobile_navigation.html.erb b/frontend/app/views/spree/shared/_mobile_navigation.html.erbindex 17715c8ef0..271b062aaa 100644--- a/frontend/app/views/spree/shared/_mobile_navigation.html.erb+++ b/frontend/app/views/spree/shared/_mobile_navigation.html.erb@@ -1,4 +1,4 @@-<% if available_menus.for_header(I18n.locale).present? %>+<% if spree_menu('header').present? %><div class="position-fixed text-uppercase d-xl-none mobile-navigation" role="navigation" aria-label="<%= Spree.t('nav_bar.mobile') %>"><div class="container d-flex align-items-center justify-content-between header-spree" data-hook><button class="m-0 p-0" id="mobile-navigation-back-button" aria-label="<%= Spree.t('nav_bar.go_to_previous_menu') %>">@@ -18,7 +18,7 @@</div><ul class="list-unstyled position-relative h-100 mobile-navigation-list">- <% available_menus.for_header(I18n.locale).children.each do |parent| %>+ <% spree_menu('header').children.each do |parent| %><li class="d-flex justify-content-between align-items-center mobile-navigation-list-item"><%= link_to parent.name, spree_localized_item_link(parent), class: 'w-75' %><% if parent.children.present? %>