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 Admin Users controller after adding `Store#users` method (#12655)

Damian Legawiec574af8712a06
diff --git a/admin/app/controllers/spree/admin/users_controller.rb b/admin/app/controllers/spree/admin/users_controller.rb
index 90a9c09a85..79db490687 100644
--- a/admin/app/controllers/spree/admin/users_controller.rb
+++ b/admin/app/controllers/spree/admin/users_controller.rb
@@ -52,7 +52,7 @@ module Spree
params[:q][:s] ||= 'created_at desc'
params[:q][:created_at_not_null] ||= 1
- @collection = super
+ @collection = model_class.accessible_by(current_ability, :index)
@search = @collection.ransack(params[:q])
@collection = @search.result(distinct: true).
includes(
@@ -64,6 +64,10 @@ module Spree
page(params[:page]).per(params[:per_page])
end
+ def find_resource
+ model_class.accessible_by(current_ability, :show).find(params[:id])
+ end
+
private
def user_params
diff --git a/core/app/models/concerns/spree/user_methods.rb b/core/app/models/concerns/spree/user_methods.rb
index 9630323083..71266f5978 100644
--- a/core/app/models/concerns/spree/user_methods.rb
+++ b/core/app/models/concerns/spree/user_methods.rb
@@ -33,7 +33,7 @@ module Spree
has_many :gateway_customers, class_name: 'Spree::GatewayCustomer', foreign_key: :user_id
has_many :invitations, class_name: 'Spree::Invitation', foreign_key: :invitee_id, dependent: :destroy
has_many :resource_users, class_name: 'Spree::ResourceUser', foreign_key: :user_id, dependent: :destroy, as: :user
- has_many :resources, through: :resource_users, source: :resource
+ has_many :stores, through: :resource_users, source: :resource, source_type: 'Spree::Store'
belongs_to :ship_address, class_name: 'Spree::Address', optional: true
belongs_to :bill_address, class_name: 'Spree::Address', optional: true