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
Feature/filter by role (#12527)
will04d29d9d428e
diff --git a/admin/app/helpers/spree/admin/users_helper.rb b/admin/app/helpers/spree/admin/users_helper.rbindex 9a44a69b0f..be62baeab8 100644--- a/admin/app/helpers/spree/admin/users_helper.rb+++ b/admin/app/helpers/spree/admin/users_helper.rb@@ -28,6 +28,10 @@ module Spreedef users_for_select_options@users_for_select_options ||= Spree.user_class.accessible_by(current_ability).pluck(:id, :email).map { |id, email| { id: id, name: email } }.as_jsonend++ def user_roles_json_array+ @user_roles_json_array ||= Spree::Role.pluck(:id, :name).map { |id, name| { id: id, name: name } }.as_json+ endendendenddiff --git a/admin/app/views/spree/admin/users/_filters.html.erb b/admin/app/views/spree/admin/users/_filters.html.erbindex 7b02b0dd01..ed23641131 100644--- a/admin/app/views/spree/admin/users/_filters.html.erb+++ b/admin/app/views/spree/admin/users/_filters.html.erb@@ -56,6 +56,20 @@{ class: "custom-select", data: { filters_target: :input } } %></div></div>+ <div class="col-lg-3">+ <div class="form-group">+ <%= f.label :spree_roles_name_in, Spree.t(:roles) %>+ <%= tom_select_tag "q[spree_roles_name_in]",+ active_option: params.dig(:q, :spree_roles_name_in),+ options: user_roles_json_array,+ multiple: true,+ value_field: :name,+ select_class: "w-100",+ select_data: {+ filters_target: "input",+ } %>+ </div>+ </div></div><div class="form-actions"><%= turbo_save_button_tag Spree.t(:filter_results) do %>diff --git a/core/app/models/concerns/spree/user_methods.rb b/core/app/models/concerns/spree/user_methods.rbindex b23d0c3cd6..8e055fdf92 100644--- a/core/app/models/concerns/spree/user_methods.rb+++ b/core/app/models/concerns/spree/user_methods.rb@@ -63,7 +63,7 @@ module Spreewhere(email: sanitized_query).or(where(name_conditions.reduce(:or)))end- self.whitelisted_ransackable_associations = %w[bill_address ship_address addresses tags]+ self.whitelisted_ransackable_associations = %w[bill_address ship_address addresses tags spree_roles]self.whitelisted_ransackable_attributes = %w[id email first_name last_name accepts_email_marketing]self.whitelisted_ransackable_scopes = %w[multi_search]