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
Fixed bugs and brakeman warnings
Damian Legawiec3e16cbb41b42
diff --git a/admin/app/controllers/spree/admin/table_columns_controller.rb b/admin/app/controllers/spree/admin/table_columns_controller.rbindex d47021ce09..8036da547f 100644--- a/admin/app/controllers/spree/admin/table_columns_controller.rb+++ b/admin/app/controllers/spree/admin/table_columns_controller.rb@@ -4,23 +4,35 @@ module Spree# POST /admin/table_columns# Updates the selected columns for a table in the sessiondef update- table_key = params[:table_key]+ session_key = table_session_keycolumns = params[:columns]- if table_key.present?+ if session_key.present?if columns.present?# Filter to only include valid column keyscolumn_keys = Array(columns).map(&:to_sym)- session["table_columns_#{table_key}"] = column_keys.join(',')+ session[session_key] = column_keys.join(',')else# Clear selection to use defaults- session.delete("table_columns_#{table_key}")+ session.delete(session_key)endend- redirect_url = params[:redirect_url].presence || request.referer || spree.admin_path+ # Use url_from to validate redirect URL is same-origin+ redirect_url = url_from(params[:redirect_url]) || url_from(request.referer) || spree.admin_pathredirect_to redirect_url, status: :see_otherend++ private++ # Returns a validated session key for table columns, or nil if invalid+ # Only allows registered table keys to prevent session manipulation+ def table_session_key+ table_key = params[:table_key].to_s.to_sym+ return nil unless Spree.admin.tables.registered?(table_key)++ "table_columns_#{table_key}"+ endendendenddiff --git a/admin/app/models/spree/admin/table.rb b/admin/app/models/spree/admin/table.rbindex 9c7715a05c..94ee2208fa 100644--- a/admin/app/models/spree/admin/table.rb+++ b/admin/app/models/spree/admin/table.rb@@ -2,9 +2,9 @@ module Spreemodule Adminclass Tableattr_reader :columns, :bulk_actions, :context, :model_class- attr_accessor :search_param, :search_placeholder, :row_actions, :row_actions_edit, :row_actions_delete+ attr_accessor :search_param, :search_placeholder, :row_actions, :row_actions_edit, :row_actions_delete, :new_resource- def initialize(context, model_class: nil, search_param: :name_cont, search_placeholder: nil, row_actions: true, row_actions_edit: true, row_actions_delete: false)+ def initialize(context, model_class: nil, search_param: :name_cont, search_placeholder: nil, row_actions: false, row_actions_edit: true, row_actions_delete: false, new_resource: true)@context = context@model_class = model_class@columns = {}@@ -14,6 +14,7 @@ module Spree@row_actions = row_actions@row_actions_edit = row_actions_edit@row_actions_delete = row_actions_delete+ @new_resource = new_resourceend# Check if row actions are enabled@@ -242,7 +243,8 @@ module Spreesearch_placeholder: search_placeholder,row_actions: row_actions,row_actions_edit: row_actions_edit,- row_actions_delete: row_actions_delete+ row_actions_delete: row_actions_delete,+ new_resource: new_resource)@columns.each do |key, column|cloned.columns[key] = column.deep_clonediff --git a/admin/app/views/spree/admin/tables/_table.html.erb b/admin/app/views/spree/admin/tables/_table.html.erbindex 0c618b4178..4cfc647036 100644--- a/admin/app/views/spree/admin/tables/_table.html.erb+++ b/admin/app/views/spree/admin/tables/_table.html.erb@@ -48,7 +48,7 @@<%= render 'spree/admin/shared/index_table_options', collection: collection %><% else %><%= render 'spree/admin/shared/no_resource_found',- new_object_url: (new_object_url if respond_to?(:new_object_url) && can?(:create, table.model_class)) %>+ new_object_url: (new_object_url if table.new_resource && respond_to?(:new_object_url) && can?(:create, table.model_class)) %><% end %></div><% end %>diff --git a/admin/app/views/spree/admin/users/_tabs.html.erb b/admin/app/views/spree/admin/users/_tabs.html.erbindex 9065e56a35..36a667c04c 100644--- a/admin/app/views/spree/admin/users/_tabs.html.erb+++ b/admin/app/views/spree/admin/users/_tabs.html.erb@@ -54,11 +54,9 @@<% if spree.respond_to?(:admin_user_gift_cards_path) && can?(:read, Spree::GiftCard) %><div data-tabs-target="panel" id="pills-gift-cards" role="tabpanel" aria-labelledby="pills-gift-cards" hidden class="animate-fade-in">- <div class="card-lg">- <%= turbo_frame_tag :gift_cards_list, src: spree.admin_user_gift_cards_path(@user, frame_name: :gift_cards_list), loading: :lazy, autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %>- <%= render 'spree/admin/shared/spinner' %>- <% end %>- </div>+ <%= turbo_frame_tag :gift_cards, src: spree.admin_user_gift_cards_path(@user), loading: :lazy, autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %>+ <%= render 'spree/admin/shared/spinner' %>+ <% end %></div><% end %>diff --git a/admin/config/initializers/spree_admin_tables.rb b/admin/config/initializers/spree_admin_tables.rbindex e6d4f81269..bba80d1935 100644--- a/admin/config/initializers/spree_admin_tables.rb+++ b/admin/config/initializers/spree_admin_tables.rb@@ -464,7 +464,7 @@ Rails.application.config.after_initialize doposition: 50# Register Posts table- Spree.admin.tables.register(:posts, model_class: Spree::Post, search_param: :title_cont)+ Spree.admin.tables.register(:posts, model_class: Spree::Post, search_param: :title_cont, row_actions: true)Spree.admin.tables.posts.add :title,label: :title,@@ -503,7 +503,7 @@ Rails.application.config.after_initialize doposition: 40# Register Customer Returns table- Spree.admin.tables.register(:customer_returns, model_class: Spree::CustomerReturn, search_param: :number_cont, row_actions: false)+ Spree.admin.tables.register(:customer_returns, model_class: Spree::CustomerReturn, search_param: :number_cont, row_actions: false, new_resource: false)Spree.admin.tables.customer_returns.add :number,label: :number,@@ -559,7 +559,7 @@ Rails.application.config.after_initialize domethod: ->(cr) { cr.display_pre_tax_total }# Register Option Types table- Spree.admin.tables.register(:option_types, model_class: Spree::OptionType, search_param: :name_cont)+ Spree.admin.tables.register(:option_types, model_class: Spree::OptionType, search_param: :name_cont, row_actions: true)Spree.admin.tables.option_types.add :name,label: :internal_name,@@ -605,7 +605,7 @@ Rails.application.config.after_initialize domethod: ->(ot) { ot.products.count }# Register Newsletter Subscribers table- Spree.admin.tables.register(:newsletter_subscribers, model_class: Spree::NewsletterSubscriber, search_param: :email_cont, row_actions_edit: false, row_actions_delete: true)+ Spree.admin.tables.register(:newsletter_subscribers, model_class: Spree::NewsletterSubscriber, search_param: :email_cont, row_actions: false, new_resource: false)Spree.admin.tables.newsletter_subscribers.add :email,label: :email,@@ -651,7 +651,7 @@ Rails.application.config.after_initialize doposition: 50# Register Policies table- Spree.admin.tables.register(:policies, model_class: Spree::Policy, search_param: :name_cont)+ Spree.admin.tables.register(:policies, model_class: Spree::Policy, search_param: :name_cont, row_actions: true)Spree.admin.tables.policies.add :name,label: :name,@@ -750,7 +750,7 @@ Rails.application.config.after_initialize doposition: 60# Register Metafield Definitions table- Spree.admin.tables.register(:metafield_definitions, model_class: Spree::MetafieldDefinition, search_param: :multi_search)+ Spree.admin.tables.register(:metafield_definitions, model_class: Spree::MetafieldDefinition, search_param: :multi_search, row_actions: true)Spree.admin.tables.metafield_definitions.add :key,label: :key,diff --git a/admin/lib/spree/admin/engine.rb b/admin/lib/spree/admin/engine.rbindex c70c0aefe5..9b25ce40d5 100644--- a/admin/lib/spree/admin/engine.rb+++ b/admin/lib/spree/admin/engine.rb@@ -189,11 +189,12 @@ module Spree# @param model_class [Class, nil] The model class for this table# @param search_param [Symbol] The ransack parameter for text search (default: :name_cont)# @param search_placeholder [String, nil] Custom placeholder for search field- # @param row_actions [Boolean] Whether to show row actions (default: true)+ # @param row_actions [Boolean] Whether to show row actions (default: false)# @param row_actions_edit [Boolean] Whether to show edit button in row actions (default: true)# @param row_actions_delete [Boolean] Whether to show delete button in row actions (default: false)+ # @param new_resource [Boolean] Whether to show "Create new" button in empty state (default: true)# @return [Spree::Admin::Table] The table instance- def register(name, model_class: nil, search_param: :name_cont, search_placeholder: nil, row_actions: true, row_actions_edit: true, row_actions_delete: false)+ def register(name, model_class: nil, search_param: :name_cont, search_placeholder: nil, row_actions: false, row_actions_edit: true, row_actions_delete: false, new_resource: true)name = name.to_sym@registries[name] ||= Spree::Admin::Table.new(name,@@ -202,7 +203,8 @@ module Spreesearch_placeholder: search_placeholder,row_actions: row_actions,row_actions_edit: row_actions_edit,- row_actions_delete: row_actions_delete+ row_actions_delete: row_actions_delete,+ new_resource: new_resource)end