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
Fix policy, policy json preview and policy translation links (#13239)
Łukasz Adamczyk80ed0e9d37b4
diff --git a/admin/app/controllers/spree/admin/policies_controller.rb b/admin/app/controllers/spree/admin/policies_controller.rbindex e0d4724340..c22a08e4ad 100644--- a/admin/app/controllers/spree/admin/policies_controller.rb+++ b/admin/app/controllers/spree/admin/policies_controller.rb@@ -7,14 +7,6 @@ module Spreeprivate- def collection- model_class.accessible_by(current_ability, :manage)- end-- def find_resource- model_class.accessible_by(current_ability, :manage).friendly.find(params[:id])- end-def permitted_resource_paramsparams.require(:policy).permit(permitted_policy_attributes)end@@ -26,6 +18,11 @@ module Spreedef set_policy_owner@policy.owner ||= current_storeend++ def object_url(object = nil, options = {})+ target = object || @object+ spree.admin_policy_url(target&.id, options)+ endendendenddiff --git a/admin/app/views/spree/admin/policies/_table_row.html.erb b/admin/app/views/spree/admin/policies/_table_row.html.erbindex 8566933d49..ef3a8b9f5c 100644--- a/admin/app/views/spree/admin/policies/_table_row.html.erb+++ b/admin/app/views/spree/admin/policies/_table_row.html.erb@@ -1,6 +1,6 @@<tr id="<%= spree_dom_id policy %>" data-controller="row-link"><td class="w-30 cursor-pointer" data-action="click->row-link#openLink">- <%= link_to policy.name, spree.edit_admin_policy_path(policy), class: 'text-decoration-none d-flex align-items-center font-weight-bold text-dark', data: { row_link_target: :link, turbo_frame: '_top' } %>+ <%= link_to policy.name, spree.edit_admin_policy_path(policy.id), class: 'text-decoration-none d-flex align-items-center font-weight-bold text-dark', data: { row_link_target: :link, turbo_frame: '_top' } %></td><td class="w-25 cursor-pointer" data-action="click->row-link#openLink"><code><%= policy.slug %></code>@@ -15,6 +15,6 @@<%= policy.owner.name %></td><td class="w-10 actions">- <%= link_to_edit(policy, class: 'btn btn-light btn-sm', data: { turbo_frame: '_top' }) if can?(:edit, policy) %>+ <%= link_to_edit(policy, url: spree.edit_admin_policy_path(policy.id), class: 'btn btn-light btn-sm', data: { turbo_frame: '_top' }) if can?(:edit, policy) %></td></tr>\ No newline at end of filediff --git a/core/app/models/spree/policy.rb b/core/app/models/spree/policy.rbindex 798481ed50..6254962845 100644--- a/core/app/models/spree/policy.rb+++ b/core/app/models/spree/policy.rb@@ -47,6 +47,12 @@ module Spreebefore_destroy :really_destroy_slugs!+ # For policies, store.policies returns all policies owned by the store+ # We don't want to filter out other policies in requests that use `for_store` when they have a different owner type+ def self.for_store(store)+ store.policies.or(where.not(owner_type: 'Spree::Store'))+ end+def page_builder_urlreturn unless Spree::Core::Engine.routes.url_helpers.respond_to?(:policy_path)diff --git a/core/spec/models/spree/policy_spec.rb b/core/spec/models/spree/policy_spec.rbindex e7e0c99150..89f70a122f 100644--- a/core/spec/models/spree/policy_spec.rb+++ b/core/spec/models/spree/policy_spec.rb@@ -94,6 +94,19 @@ RSpec.describe Spree::Policy, type: :model doexpect(result).to include(store1_policy)expect(result).not_to include(store2_policy)end++ context 'for policies with a different owner type' do+ let(:user_policy) { create(:policy, owner: create(:user)) }++ it 'returns policies for the store and the user policy' do+ result = described_class.for_store(store)++ expect(result).to include(store1_policy)+ expect(result).to include(user_policy)++ expect(result).not_to include(store2_policy)+ end+ endendendend