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.

Remove meganav assets generator.

Matthew Kennedybd5f6e4a5673
diff --git a/core/app/models/spree/menu.rb b/core/app/models/spree/menu.rb
index 5fdbc2c01b..667b9608ae 100644
--- a/core/app/models/spree/menu.rb
+++ b/core/app/models/spree/menu.rb
@@ -7,8 +7,7 @@ module Spree
before_validation :paremeterize_unique_code
after_create :set_root
- validate :uniqueness_of_code_within_scope_of_stores
-
+ validate :uniqueness_of_code_within_stores
validates :name, presence: true
scope :by_store, ->(store) { joins(:stores).where('store_id = ?', store) }
@@ -26,15 +25,20 @@ module Spree
self.root ||= MenuItem.create!(menu_id: id, name: name, item_type: 'Container', code: "#{name}-root")
end
- def uniqueness_of_code_within_scope_of_stores
- existing_menu = []
+ def uniqueness_of_code_within_stores
+ menus = []
- store_ids.map do |s|
- Spree::Menu.by_store(s).by_unique_code(unique_code).each { |m| existing_menu << m.name unless id == m.id }
+ store_ids.map do |store_id|
+ Menu.by_store(store_id).
+ by_unique_code(unique_code).
+ each { |match| menus << match.name unless id == match.id }
end
- unless existing_menu.empty?
- errors.add(:unique_code, Spree.t('admin.navigation.scope_unique_name_store_id_error', code: unique_code, menus: existing_menu[0]))
+ unless menus.empty?
+ errors.add(:unique_code,
+ Spree.t('admin.navigation.scope_unique_name_store_id_error',
+ code: unique_code,
+ menus: menus[0]))
end
end
end
diff --git a/frontend/lib/generators/spree/frontend/install/install_generator.rb b/frontend/lib/generators/spree/frontend/install/install_generator.rb
index 3d592d5c04..e4cdbd83c2 100644
--- a/frontend/lib/generators/spree/frontend/install/install_generator.rb
+++ b/frontend/lib/generators/spree/frontend/install/install_generator.rb
@@ -19,7 +19,6 @@ module Spree
# static images
directory 'noimage', './app/assets/images/noimage'
directory 'homepage', './app/assets/images/homepage'
- directory 'meganav', './app/assets/images/meganav'
# SCSS theming
template 'variables.scss', './app/assets/stylesheets/spree/frontend/variables/variables.scss'
# Sprockets 4 manifest