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.

Fixed metafields/translations links in Admin with Prefixed IDs (#13846)

Damian Legawiec3716791a6a0c
diff --git a/spree/admin/app/helpers/spree/admin/metafields_helper.rb b/spree/admin/app/helpers/spree/admin/metafields_helper.rb
index d08066d4f6..b724e0e161 100644
--- a/spree/admin/app/helpers/spree/admin/metafields_helper.rb
+++ b/spree/admin/app/helpers/spree/admin/metafields_helper.rb
@@ -10,7 +10,7 @@ module Spree
options[:class] ||= 'dropdown-item'
options[:data] ||= { action: 'drawer#open', turbo_frame: :drawer }
- link_to_with_icon 'edit', Spree.t(:metafields), spree.edit_admin_metafield_path(record.id, resource_type: record.class.name), options
+ link_to_with_icon 'edit', Spree.t(:metafields), spree.edit_admin_metafield_path(record.to_param, resource_type: record.class.name), options
end
def metafield_definition_resource_types
diff --git a/spree/admin/app/helpers/spree/admin/translations_helper.rb b/spree/admin/app/helpers/spree/admin/translations_helper.rb
index c7f7c13231..ae0c2e6b19 100644
--- a/spree/admin/app/helpers/spree/admin/translations_helper.rb
+++ b/spree/admin/app/helpers/spree/admin/translations_helper.rb
@@ -12,7 +12,7 @@ module Spree
link_to_with_icon(
'language',
Spree.t(:translations),
- spree.edit_admin_translation_path(resource.id, resource_type: resource.class.to_s),
+ spree.edit_admin_translation_path(resource.to_param, resource_type: resource.class.to_s),
options
)
end
diff --git a/spree/admin/app/views/spree/admin/metafields/edit.html.erb b/spree/admin/app/views/spree/admin/metafields/edit.html.erb
index 0cf8b0a1fe..723f219c48 100644
--- a/spree/admin/app/views/spree/admin/metafields/edit.html.erb
+++ b/spree/admin/app/views/spree/admin/metafields/edit.html.erb
@@ -1,7 +1,7 @@
<%= turbo_frame_tag :drawer do %>
<%= drawer_header(Spree.t(:metafields)) %>
<% if @metafields.present? %>
- <%= form_for @object, url: spree.admin_metafield_path(@object.id, resource_type: model_class.to_s), method: :put do |f| %>
+ <%= form_for @object, url: spree.admin_metafield_path(@object.to_param, resource_type: model_class.to_s), method: :put do |f| %>
<div class="drawer-body">
<%= f.fields_for :metafields, @metafields do |metafield_form| %>
<%= metafield_form.hidden_field :id %>
diff --git a/spree/admin/app/views/spree/admin/translations/edit.html.erb b/spree/admin/app/views/spree/admin/translations/edit.html.erb
index dcbb50b328..10c73b9886 100644
--- a/spree/admin/app/views/spree/admin/translations/edit.html.erb
+++ b/spree/admin/app/views/spree/admin/translations/edit.html.erb
@@ -1,7 +1,7 @@
<%= turbo_frame_tag :drawer do %>
<%= drawer_header(Spree.t(:translations)) %>
<% if @locales.any? %>
- <%= form_for @object, url: spree.admin_translation_path(@object.id, resource_type: model_class.to_s), method: :put do |f| %>
+ <%= form_for @object, url: spree.admin_translation_path(@object.to_param, resource_type: model_class.to_s), method: :put do |f| %>
<div class="drawer-body">
<ul class="nav nav-pills mb-3">
<% @locales.each do |locale| %>
@@ -32,7 +32,7 @@
<p class="text-center mb-3"><%= Spree.t('admin.translations.no_translations_configured') %></p>
<% if can?(:edit, current_store) %>
- <%= link_to_with_icon 'settings', Spree.t('admin.translations.configure_store'), spree.edit_admin_store_path(section: 'general-settings'), class: 'btn btn-primary', data: { 'turbo-frame': '_top' } %>
+ <%= link_to_with_icon 'world', Spree.t('admin.translations.manage_markets'), spree.edit_admin_store_path(section: 'general-settings'), class: 'btn btn-primary', data: { 'turbo-frame': '_top' } %>
<% end %>
</div>
</div>
diff --git a/spree/admin/config/locales/en.yml b/spree/admin/config/locales/en.yml
index 3f77bad0ef..f523b0d8a7 100644
--- a/spree/admin/config/locales/en.yml
+++ b/spree/admin/config/locales/en.yml
@@ -369,8 +369,8 @@ en:
manual: Manual
manual_info: Curate products manually. You can add or remove them in bulk.
translations:
- configure_store: Configure store
- no_translations_configured: No translations configured. Please configure more than one locale for the store to use translations.
+ manage_markets: Manage Markets
+ no_translations_configured: No translations configured. Please setup Markets to use translations.
upload_new_asset: Upload new asset
user:
last_order_placed: Last order placed
diff --git a/spree/admin/spec/controllers/spree/admin/metafields_controller_spec.rb b/spree/admin/spec/controllers/spree/admin/metafields_controller_spec.rb
index 371e87d012..4f74687c6b 100644
--- a/spree/admin/spec/controllers/spree/admin/metafields_controller_spec.rb
+++ b/spree/admin/spec/controllers/spree/admin/metafields_controller_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Spree::Admin::MetafieldsController, type: :controller do
describe 'GET #edit' do
it 'assigns @object and @metafields and renders the edit template' do
- get :edit, params: { resource_type: resource_type, id: product.id }
+ get :edit, params: { resource_type: resource_type, id: product.to_param }
expect(response).to render_template(:edit)
expect(assigns(:object)).to eq(product)
expect(assigns(:metafields)).to be_present
@@ -27,7 +27,7 @@ RSpec.describe Spree::Admin::MetafieldsController, type: :controller do
let!(:metafield) { create(:metafield, resource: product, metafield_definition: metafield_definition) }
it 'assigns @resource and @metafields and renders the edit template' do
- get :edit, params: { resource_type: resource_type, id: product.id }
+ get :edit, params: { resource_type: resource_type, id: product.to_param }
expect(response).to render_template(:edit)
expect(assigns(:object)).to eq(product)
expect(assigns(:metafields)).to be_present
@@ -50,7 +50,7 @@ RSpec.describe Spree::Admin::MetafieldsController, type: :controller do
context 'when resource_type is invalid' do
it 'raises ActiveRecord::RecordNotFound' do
expect {
- get :edit, params: { resource_type: 'InvalidType', id: product.id }
+ get :edit, params: { resource_type: 'InvalidType', id: product.to_param }
}.to raise_error(ActiveRecord::RecordNotFound)
end
end
@@ -89,7 +89,7 @@ RSpec.describe Spree::Admin::MetafieldsController, type: :controller do
it 'updates metafields and sets flash success' do
put :update, format: :turbo_stream, params: {
resource_type: resource_type,
- id: product.id,
+ id: product.to_param,
product: metafield_attributes
}
expect(response).to have_http_status(:ok)
diff --git a/spree/admin/spec/controllers/spree/admin/translations_controller_spec.rb b/spree/admin/spec/controllers/spree/admin/translations_controller_spec.rb
index 528946a7f8..0fcd9da3f0 100644
--- a/spree/admin/spec/controllers/spree/admin/translations_controller_spec.rb
+++ b/spree/admin/spec/controllers/spree/admin/translations_controller_spec.rb
@@ -50,7 +50,7 @@ RSpec.describe Spree::Admin::TranslationsController, type: :controller do
it 'updates the translation and sets flash success' do
put :update, format: :turbo_stream, params: {
resource_type: resource_type,
- id: product.id,
+ id: product.to_param,
translation_locale: translation_locale,
product: product_params
}
@@ -64,7 +64,7 @@ RSpec.describe Spree::Admin::TranslationsController, type: :controller do
it 'raises ActiveRecord::RecordNotFound' do
expect {
put :update, format: :turbo_stream, params: {
- id: product.id,
+ id: product.to_param,
resource_type: '',
translation_locale: translation_locale,
product: product_params