solidus_backend 3.2.0.alpha → 3.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/spree/admin/users_controller.rb +7 -7
  3. data/app/views/spree/admin/stores/_form.html.erb +2 -2
  4. metadata +7 -7
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7f40b6a70c46a2ad49195d9bfd9642172fea9ec7375b9253adab0f9eaf2bb3c0
4
- data.tar.gz: 90b8118323724ba9953ca65dbf44139349a6dafdb59c4e9d7823a8fdff47ef92
3
+ metadata.gz: c55b819b0c157a4f629d3a65309bd3afe6d2a803ffcea1244c2926c8403af3de
4
+ data.tar.gz: 5cb32cd0595023918134a00859f033962b0aa6ec62d98c5220a96ea847d35b88
5
5
  SHA512:
6
- metadata.gz: 2145cf1b419208c84b5a671b67eecde34b56c3cc9efdcd40d43271489855368dcf35268c64fe2d1c08e7977aa81b4eb6472c37eb184d86197b760a3b08a9be6a
7
- data.tar.gz: c5e1b38dc22dc6a654dd8e05f3445e8c725ea7d6df2b27544f16dc95a25307e646f8d282e7139c925b83f07d72fc1b2d65c0f8050789e80230f3e91fe4db4ef6
6
+ metadata.gz: e72d2981c0b252a9648d4a617215a20771e4155bb1a4dff301db77e16cfee73f2665883212ffa36a04d2df824ad13010892c6e9ab1fbdfc979f0d0ada567b0dd
7
+ data.tar.gz: 5bdd7a9d3d573e92a5ffd682f10e64921ed3cd6bd190aacd52ef7830923e66f3a3196d18d7cca1c735bd677c7d58baf83389b1c53820dcaf1d7f66fb063b10c7
data/app/controllers/spree/admin/users_controller.rb CHANGED
@@ -103,10 +103,6 @@ module Spree
103
103
  attributes |= [:email]
104
104
  end
105
105
 
106
- if can? :manage, Spree::Role
107
- attributes += [{ spree_role_ids: [] }]
108
- end
109
-
110
106
  if can? :manage, Spree::StockLocation
111
107
  attributes += [{ stock_location_ids: [] }]
112
108
  end
@@ -142,9 +138,13 @@ module Spree
142
138
  end
143
139
 
144
140
  def set_roles
145
- if user_params[:spree_role_ids]
146
- @user.spree_roles = Spree::Role.accessible_by(current_ability).where(id: user_params[:spree_role_ids])
147
- end
141
+ roles_ids = params[:user][:spree_role_ids]
142
+ return unless roles_ids
143
+
144
+ @user.update_spree_roles(
145
+ Spree::Role.where(id: roles_ids),
146
+ ability: current_ability
147
+ )
148
148
  end
149
149
 
150
150
  def set_stock_locations
data/app/views/spree/admin/stores/_form.html.erb CHANGED
@@ -62,8 +62,8 @@
62
62
  <%= f.field_container :cart_tax_country_iso do %>
63
63
  <%= f.label :cart_tax_country_iso %>
64
64
  <%= f.field_hint :cart_tax_country_iso %>
65
- <%= f.select :cart_tax_country_iso,
66
- Spree::Country.all.map { |c| [c.name, c.iso] },
65
+ <%= f.collection_select :cart_tax_country_iso,
66
+ available_countries(restrict_to_zone: nil), :iso, :name,
67
67
  { include_blank: t(".no_cart_tax_country") },
68
68
  { class: "custom-select fullwidth" } %>
69
69
  <%= f.error_message_on :cart_tax_country_iso %>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: solidus_backend
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.2.0.alpha
4
+ version: 3.2.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Solidus Team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-08-16 00:00:00.000000000 Z
11
+ date: 2022-09-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: solidus_api
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 3.2.0.alpha
19
+ version: 3.2.2
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 3.2.0.alpha
26
+ version: 3.2.2
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: solidus_core
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 3.2.0.alpha
33
+ version: 3.2.2
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 3.2.0.alpha
40
+ version: 3.2.2
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: font-awesome-rails
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -911,7 +911,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
911
911
  - !ruby/object:Gem::Version
912
912
  version: 1.8.23
913
913
  requirements: []
914
- rubygems_version: 3.1.2
914
+ rubygems_version: 3.3.19
915
915
  signing_key:
916
916
  specification_version: 4
917
917
  summary: Admin interface for the Solidus e-commerce framework.