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.

V-3095 FIX multiple user roles from different resources (#12710)

brozekc1c9df4339e2
diff --git a/admin/app/controllers/spree/admin/admin_users_controller.rb b/admin/app/controllers/spree/admin/admin_users_controller.rb
index 1fbaca9fec..f639ce2d8c 100644
--- a/admin/app/controllers/spree/admin/admin_users_controller.rb
+++ b/admin/app/controllers/spree/admin/admin_users_controller.rb
@@ -13,13 +13,16 @@ module Spree
def index
params[:q] ||= {}
params[:q][:s] ||= 'created_at asc'
- @search = scope.includes(:spree_roles, avatar_attachment: :blob).ransack(params[:q])
+ @search = scope.includes(role_users: :role, avatar_attachment: :blob).
+ where(role_users: { resource: @parent }).
+ ransack(params[:q])
@collection = @search.result
end
# GET /admin/admin_users/:id
def show
authorize! :read, @admin_user
+ @role_users = @admin_user.role_users.includes(:role).where(resource: @parent)
end
# GET /admin/admin_users/new?token=<token>
diff --git a/admin/app/views/spree/admin/admin_users/_admin_user.html.erb b/admin/app/views/spree/admin/admin_users/_admin_user.html.erb
index d9593bebd8..d5e5e0c4de 100644
--- a/admin/app/views/spree/admin/admin_users/_admin_user.html.erb
+++ b/admin/app/views/spree/admin/admin_users/_admin_user.html.erb
@@ -9,8 +9,8 @@
<% end %>
</td>
<td class="w-30" data-action="click->row-link#openLink">
- <% admin_user.spree_roles.each do |role| %>
- <span class="badge badge-light"><%= role.name %></span>
+ <% admin_user.role_users.each do |role_user| %>
+ <span class="badge badge-light"><%= role_user.role.name %></span>
<% end %>
</td>
<td class="w-20">
diff --git a/admin/app/views/spree/admin/admin_users/show.html.erb b/admin/app/views/spree/admin/admin_users/show.html.erb
index a34158e88e..b8fa12abaa 100644
--- a/admin/app/views/spree/admin/admin_users/show.html.erb
+++ b/admin/app/views/spree/admin/admin_users/show.html.erb
@@ -48,8 +48,8 @@
<li class="list-group-item d-flex justify-content-between align-items-center">
<%= Spree.t(:roles) %>
<span>
- <% @admin_user.spree_roles.each do |role| %>
- <span class="badge badge-light"><%= role.name %></span>
+ <% @role_users.each do |role_user| %>
+ <span class="badge badge-light"><%= role_user.role.name %></span>
<% end %>
</span>
</li>
diff --git a/admin/spec/controllers/spree/admin/admin_users_controller_spec.rb b/admin/spec/controllers/spree/admin/admin_users_controller_spec.rb
index 38fdbce8d6..17fba28c85 100644
--- a/admin/spec/controllers/spree/admin/admin_users_controller_spec.rb
+++ b/admin/spec/controllers/spree/admin/admin_users_controller_spec.rb
@@ -10,23 +10,38 @@ RSpec.describe Spree::Admin::AdminUsersController, type: :controller do
describe 'GET #index' do
stub_authorization!
- before do
- admin_user
- get :index
- end
+ before { admin_user }
it 'returns a successful response' do
+ get :index
expect(response).to be_successful
end
it 'assigns @search' do
+ get :index
expect(assigns(:search)).to be_a(Ransack::Search)
end
it 'assigns @collection' do
+ get :index
expect(assigns(:collection)).to be_a(ActiveRecord::Relation)
expect(assigns(:collection)).to include(admin_user)
end
+
+ context 'when users has roles from different resources' do
+ let(:second_store) { create(:store) }
+ let(:second_store_role) { create(:role_user, resource: second_store, user: admin_user) }
+
+ before do
+ second_store_role
+ get :index
+ end
+
+ it 'assigns @collection with roles from the current resource' do
+ expect(assigns(:collection).first.role_users.first).not_to eq(second_store_role)
+ expect(assigns(:collection).first.role_users.size).to eq(1)
+ end
+ end
end
describe 'GET #show' do
@@ -35,12 +50,29 @@ RSpec.describe Spree::Admin::AdminUsersController, type: :controller do
before { get :show, params: { id: admin_user.id } }
it 'returns a successful response' do
+ get :show, params: { id: admin_user.id }
expect(response).to be_successful
end
it 'assigns @admin_user' do
+ get :show, params: { id: admin_user.id }
expect(assigns(:admin_user)).to eq(admin_user)
end
+
+ context 'when user has roles from different resources' do
+ let(:second_store) { create(:store) }
+ let(:second_store_role) { create(:role_user, resource: second_store, user: admin_user) }
+
+ before do
+ second_store_role
+ get :show, params: { id: admin_user.id }
+ end
+
+ it 'assigns @role_users with roles from the current resource' do
+ expect(assigns(:role_users).first).not_to eq(second_store_role)
+ expect(assigns(:role_users).size).to eq(1)
+ end
+ end
end
describe 'GET #new' do