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.

V-3074 FIX taxonomies slug and taxonomy edit page (#12693)

brozekfb13f1cf4d37
diff --git a/admin/app/controllers/spree/admin/taxonomies_controller.rb b/admin/app/controllers/spree/admin/taxonomies_controller.rb
index 0e66ffc8b7..22e03eb2dc 100644
--- a/admin/app/controllers/spree/admin/taxonomies_controller.rb
+++ b/admin/app/controllers/spree/admin/taxonomies_controller.rb
@@ -6,6 +6,11 @@ module Spree
before_action :add_breadcrumbs
+ def edit
+ super
+ redirect_to spree.admin_taxonomy_taxon_path(@taxonomy, @taxonomy.root.id)
+ end
+
private
def collection
diff --git a/admin/app/controllers/spree/admin/taxons_controller.rb b/admin/app/controllers/spree/admin/taxons_controller.rb
index 4e9bad98be..77f2663323 100644
--- a/admin/app/controllers/spree/admin/taxons_controller.rb
+++ b/admin/app/controllers/spree/admin/taxons_controller.rb
@@ -77,7 +77,10 @@ module Spree
end
def set_permalink_params
- params[:taxon][:permalink] = "#{@parent_permalink}/" + params[:permalink_part] if params.key? 'permalink_part'
+ return unless params[:permalink_part]
+
+ params[:taxon] ||= {}
+ params[:taxon][:permalink] = [@parent_permalink.presence, params[:permalink_part]].compact_blank.join('/')
end
def collection_url
diff --git a/admin/spec/controllers/spree/admin/taxonomies_controller_spec.rb b/admin/spec/controllers/spree/admin/taxonomies_controller_spec.rb
new file mode 100644
index 0000000000..eda7b0c4af
--- /dev/null
+++ b/admin/spec/controllers/spree/admin/taxonomies_controller_spec.rb
@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Spree::Admin::TaxonomiesController do
+ stub_authorization!
+
+ describe '#edit' do
+ let(:taxonomy) { create(:taxonomy) }
+ let(:taxonomy_id) { taxonomy.id }
+
+ before do
+ get :edit, params: { id: taxonomy_id }
+ end
+
+ it 'redirects to taxonomy taxon path' do
+ expect(response).to redirect_to(spree.admin_taxonomy_taxon_path(taxonomy, taxonomy.root.id))
+ end
+
+ context 'when taxonomy not found' do
+ let(:taxonomy_id) { 'not_existing' }
+
+ it 'redirects to admin taxonomies path' do
+ expect(response).to redirect_to(spree.admin_taxonomies_path)
+ end
+ end
+ end
+end
diff --git a/admin/spec/controllers/spree/admin/taxons_controller_spec.rb b/admin/spec/controllers/spree/admin/taxons_controller_spec.rb
index c133d2ef63..666e1f9758 100644
--- a/admin/spec/controllers/spree/admin/taxons_controller_spec.rb
+++ b/admin/spec/controllers/spree/admin/taxons_controller_spec.rb
@@ -47,6 +47,22 @@ RSpec.describe Spree::Admin::TaxonsController, type: :controller do
put :update, params: { taxonomy_id: taxonomy.id, id: taxon.id, taxon: { name: 'New Name' } }
expect(response).to redirect_to(spree.edit_admin_taxonomy_taxon_path(taxonomy.id, taxon.id))
end
+
+ context 'when permalink_part is present' do
+ context 'and no parent taxon' do
+ it 'sets the permalink from permalink_part param' do
+ put :update, params: { taxonomy_id: taxonomy.id, id: taxonomy.root.id, permalink_part: 'new-permalink' }
+ expect(taxonomy.root.reload.permalink).to eq('new-permalink')
+ end
+ end
+
+ context 'and parent taxon is present' do
+ it 'sets the permalink from root permalink and permalink_part param' do
+ put :update, params: { taxonomy_id: taxonomy.id, id: taxon.id, permalink_part: 'new-permalink' }
+ expect(taxon.reload.permalink).to eq("#{taxonomy.root.permalink}/new-permalink")
+ end
+ end
+ end
end
describe 'PUT #reposition' do