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.

small fixes to allow extending users/invitations (#12661)

Damian Legawiec5ab18392a3a5
diff --git a/admin/app/controllers/spree/admin/admin_users_controller.rb b/admin/app/controllers/spree/admin/admin_users_controller.rb
index 8a8017f1f6..459d1f4fce 100644
--- a/admin/app/controllers/spree/admin/admin_users_controller.rb
+++ b/admin/app/controllers/spree/admin/admin_users_controller.rb
@@ -94,6 +94,10 @@ module Spree
def load_roles
@roles = Spree::Role.accessible_by(current_ability)
end
+
+ def model_class
+ Spree.admin_user_class
+ end
end
end
end
diff --git a/admin/app/views/spree/admin/invitations/new.html.erb b/admin/app/views/spree/admin/invitations/new.html.erb
index 5a97915b74..59a51d18c3 100644
--- a/admin/app/views/spree/admin/invitations/new.html.erb
+++ b/admin/app/views/spree/admin/invitations/new.html.erb
@@ -10,7 +10,7 @@
<%= f.label :email, Spree.t(:email) %>
<%= f.email_field :email, class: 'form-control', required: :required, data: { 'enable-button-target': 'input' }, placeholder: 'eg. [email protected]' %>
</div>
- <% if can?(:manage, Spree::Role) %>
+ <% if @roles.any? %>
<div class="form-group">
<%= f.label :role, Spree.t(:roles) %>
<%= f.select :role_ids, @roles.map { |role| [role.name, role.id] }, {}, { data: { controller: 'autocomplete-select', 'enable-button-target': 'input' }, multiple: true, required: true } %>