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
Admin - fixed ability checks for Metafields/Translations/JSON preview… (#13215)
Damian Legawiec3fe1287ee156
diff --git a/admin/app/controllers/spree/admin/json_previews_controller.rb b/admin/app/controllers/spree/admin/json_previews_controller.rbindex 1f129cfff8..3e3414f128 100644--- a/admin/app/controllers/spree/admin/json_previews_controller.rb+++ b/admin/app/controllers/spree/admin/json_previews_controller.rb@@ -14,9 +14,9 @@ module Spreeraise ActiveRecord::RecordNotFound if resource_type.blank?@resource = if resource_type.respond_to?(:friendly)- resource_type.friendly.find(params[:id])+ resource_type.friendly.accessible_by(current_ability, :read).find(params[:id])else- resource_type.find(params[:id])+ resource_type.accessible_by(current_ability, :read).find(params[:id])endenddiff --git a/admin/app/controllers/spree/admin/metafields_controller.rb b/admin/app/controllers/spree/admin/metafields_controller.rbindex a94ba75a16..e41623e9f4 100644--- a/admin/app/controllers/spree/admin/metafields_controller.rb+++ b/admin/app/controllers/spree/admin/metafields_controller.rb@@ -38,9 +38,9 @@ module Spreeraise ActiveRecord::RecordNotFound if resource_type.blank?@resource = if resource_type.respond_to?(:friendly)- resource_type.friendly.find(params[:id])+ resource_type.friendly.accessible_by(current_ability, :update).find(params[:id])else- resource_type.find(params[:id])+ resource_type.accessible_by(current_ability, :update).find(params[:id])endenddiff --git a/admin/app/controllers/spree/admin/translations_controller.rb b/admin/app/controllers/spree/admin/translations_controller.rbindex 493c8a8e38..6fb49747e4 100644--- a/admin/app/controllers/spree/admin/translations_controller.rb+++ b/admin/app/controllers/spree/admin/translations_controller.rb@@ -2,7 +2,7 @@ module Spreemodule Adminclass TranslationsController < Spree::Admin::BaseController# Set the resource being translated and any related data- before_action :set_resource, only: [:edit, :update]+ before_action :load_resource, only: [:edit, :update]before_action :load_data, only: [:edit, :update]before_action :set_translation_locale, only: [:edit, :update]helper_method :normalized_locale@@ -63,11 +63,11 @@ module Spreeend# Set the resource object using friendly find if available- def set_resource+ def load_resource@resource = if resource_class.respond_to?(:friendly)- resource_class.friendly.find(params[:id])+ resource_class.friendly.accessible_by(current_ability, :update).find(params[:id])else- resource_class.find(params[:id])+ resource_class.accessible_by(current_ability, :update).find(params[:id])endenddiff --git a/admin/app/helpers/spree/admin/json_preview_helper.rb b/admin/app/helpers/spree/admin/json_preview_helper.rbindex 474c6858f7..290bc30f8b 100644--- a/admin/app/helpers/spree/admin/json_preview_helper.rb+++ b/admin/app/helpers/spree/admin/json_preview_helper.rb@@ -4,6 +4,7 @@ module Spreedef link_to_show_json(record, options = {})return unless json_serializers_available?(record)return unless can?(:read, record)+ return unless can?(:read, :json_preview)options[:class] ||= 'dropdown-item'options[:data] ||= { action: 'drawer#open', turbo_frame: :drawer }diff --git a/admin/app/helpers/spree/admin/metafields_helper.rb b/admin/app/helpers/spree/admin/metafields_helper.rbindex b98f5735bd..f6fefb88b7 100644--- a/admin/app/helpers/spree/admin/metafields_helper.rb+++ b/admin/app/helpers/spree/admin/metafields_helper.rb@@ -4,6 +4,8 @@ module Spreedef link_to_edit_metafields(record, options = {})return unless Spree::MetafieldDefinition.available_resources.map(&:name).include?(record.class.name)return unless record.respond_to?(:metafields)+ return unless can?(:manage, record)+ return unless can?(:manage, Spree::Metafield)options[:class] ||= 'dropdown-item'options[:data] ||= { action: 'drawer#open', turbo_frame: :drawer }diff --git a/admin/app/helpers/spree/admin/translations_helper.rb b/admin/app/helpers/spree/admin/translations_helper.rbindex 6444c2edf5..484dbaf303 100644--- a/admin/app/helpers/spree/admin/translations_helper.rb+++ b/admin/app/helpers/spree/admin/translations_helper.rb@@ -4,6 +4,7 @@ module Spreedef link_to_edit_translations(resource, options = {})return unless Rails.application.config.spree.translatable_resources.map(&:name).include?(resource.class.name)return unless can?(:update, resource)+ return unless can?(:update, :translations)options[:class] ||= 'dropdown-item'options[:data] ||= { action: 'drawer#open', turbo_frame: :drawer }