solidus_backend 3.1.6 → 3.1.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/spree/admin/users_controller.rb +2 -2
  3. data/app/views/spree/admin/users/_form.html.erb +1 -0
  4. data/app/views/spree/admin/users/index.html.erb +1 -1
  5. metadata +7 -7
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8dc01e3b01c3876e3d6f6ba3868989c62f93183e596b459ed0e5684ac9675b80
4
- data.tar.gz: 5e331223ae29935f1faa971e3ed5576ce31e9f351e186132c9015fa6618c2457
3
+ metadata.gz: 8903b91d3f4fae6507dfe625e8f9b24874d0dca1112326f34a59d2248ebdc710
4
+ data.tar.gz: 41efa75c338489bf545c78dbe068a790a2ff65921e3eeaea269f6a35c4c32a78
5
5
  SHA512:
6
- metadata.gz: 7f94b557b15f599f621aa4a1258a605448b6470c4815757e2f816211921e32fe75f31e80b4d92ca5e67b51c9970e2170fb7f87399099de752b7d02179827da48
7
- data.tar.gz: fb27ed84fc99b2070b856195f81622ff4c1c64bb70f9d8fc7b3bf018fb4ff717f12d6d9e9eb8c927a39b14fc5a7f45e428ac250ecd1f3847b53322692a2343a5
6
+ metadata.gz: 6392976b28c3318b3e6cac80eed33e2cbcc9ac6e9b502aab43d0214bb6926fe9e2b683b56234aee11f47045f8dbcf192283c5e2eeed4d2eed28790605af43577
7
+ data.tar.gz: d91c2ec5947013f55f8fa6b5abed42fc7ae9f11bb86cce6f424f63ee4c775da71253bd2d9b2b96269de3ff47448aa82864407e349b8a27bae02659fc3a41f2e0
data/app/controllers/spree/admin/users_controller.rb CHANGED
@@ -92,7 +92,7 @@ module Spree
92
92
 
93
93
  @search = super.ransack(params[:q])
94
94
  @collection = @search.result.includes(:spree_roles)
95
- @collection = @collection.includes(:spree_orders)
95
+ @collection = @collection.includes(:orders)
96
96
  @collection = @collection.page(params[:page]).per(Spree::Config[:admin_products_per_page])
97
97
  end
98
98
 
@@ -121,7 +121,7 @@ module Spree
121
121
  # handling raise from Spree::Admin::ResourceController#destroy
122
122
  def user_destroy_with_orders_error
123
123
  invoke_callbacks(:destroy, :fails)
124
- render status: :forbidden, text: t('spree.error_user_destroy_with_orders')
124
+ render status: :forbidden, plain: t("spree.error_user_destroy_with_orders")
125
125
  end
126
126
 
127
127
  def sign_in_if_change_own_password
data/app/views/spree/admin/users/_form.html.erb CHANGED
@@ -40,6 +40,7 @@
40
40
  <%= label_tag nil, plural_resource_name(Spree::StockLocation) %>
41
41
  <ul>
42
42
  <% if can?(:manage, Spree::UserStockLocation) %>
43
+ <%= hidden_field_tag('user[stock_location_ids][]', nil) %>
43
44
  <% @stock_locations.each do |stock_location| %>
44
45
  <li>
45
46
  <label>
data/app/views/spree/admin/users/index.html.erb CHANGED
@@ -89,7 +89,7 @@
89
89
  <% if can?(:edit, user) %>
90
90
  <%= link_to_edit user, no_text: true %>
91
91
  <% end %>
92
- <% if can?(:destroy, user) && user.orders.count.zero? %>
92
+ <% if can?(:destroy, user) && user.orders.none? %>
93
93
  <%= link_to_delete user, no_text: true %>
94
94
  <% end %>
95
95
  </td>
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.1.6
4
+ version: 3.1.7
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-06-01 00:00:00.000000000 Z
11
+ date: 2022-07-15 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.1.6
19
+ version: 3.1.7
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.1.6
26
+ version: 3.1.7
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.1.6
33
+ version: 3.1.7
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.1.6
40
+ version: 3.1.7
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: coffee-rails
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -920,7 +920,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
920
920
  - !ruby/object:Gem::Version
921
921
  version: 1.8.23
922
922
  requirements: []
923
- rubygems_version: 3.2.31
923
+ rubygems_version: 3.1.2
924
924
  signing_key:
925
925
  specification_version: 4
926
926
  summary: Admin interface for the Solidus e-commerce framework.