solidus_backend 2.11.16 → 2.11.17

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 (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: 42afce2a5e13da1fbccb5f032045f0222562f66300246dfafac50716442c2147
4
- data.tar.gz: ba4b81895f9277e7aab85742a73197f82f2aaf05b4e7e213efe0e3cfa5f788c8
3
+ metadata.gz: aac00b927565875614437f63f0e5ab707b7722c96988d83ddd01c306aee9b448
4
+ data.tar.gz: 0a18d3f2fa77aa217f71602cebe0529b0eedeb21ad56d7cf447c09f1d88c2d67
5
5
  SHA512:
6
- metadata.gz: c75d827a21175ed990e77f612d9b49900412c0924bf6af054a6a4c848738ada0aea628758f9ac736601930ccd83f635ad1fe04395c7d9daace860b420621ef59
7
- data.tar.gz: fd3cea29aeedc2d8950f81699405e796008d44112d1bda7c67662739d97177a80e167695d37f369e6eea9306fda340d5a7a62ffff939fa92153360eb7112ea6f
6
+ metadata.gz: 3c1e390834e5d121f1c93c79581bbcd646eb3bf299ecfa91097772a56bd4607223416640d238c84de12d184846c5c54642c086b067c4a9c4dbde3e6bf33eabee
7
+ data.tar.gz: d29956ffb3501f2b0adaa70b94ca5fd0408d217f1ae0eed79592fb1f555d30bbdf078c1a053041a4268f47fcb02e18865d68c9d711b940e5ab72b4c3b17660af
data/app/controllers/spree/admin/users_controller.rb CHANGED
@@ -126,7 +126,7 @@ module Spree
126
126
 
127
127
  @search = super.ransack(params[:q])
128
128
  @collection = @search.result.includes(:spree_roles)
129
- @collection = @collection.includes(:spree_orders)
129
+ @collection = @collection.includes(:orders)
130
130
  @collection = @collection.page(params[:page]).per(Spree::Config[:admin_products_per_page])
131
131
  end
132
132
 
@@ -155,7 +155,7 @@ module Spree
155
155
  # handling raise from Spree::Admin::ResourceController#destroy
156
156
  def user_destroy_with_orders_error
157
157
  invoke_callbacks(:destroy, :fails)
158
- render status: :forbidden, text: t('spree.error_user_destroy_with_orders')
158
+ render status: :forbidden, plain: t("spree.error_user_destroy_with_orders")
159
159
  end
160
160
 
161
161
  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: 2.11.16
4
+ version: 2.11.17
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: 2.11.16
19
+ version: 2.11.17
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: 2.11.16
26
+ version: 2.11.17
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: 2.11.16
33
+ version: 2.11.17
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: 2.11.16
40
+ version: 2.11.17
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: coffee-rails
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -919,7 +919,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
919
919
  - !ruby/object:Gem::Version
920
920
  version: 1.8.23
921
921
  requirements: []
922
- rubygems_version: 3.2.31
922
+ rubygems_version: 3.1.2
923
923
  signing_key:
924
924
  specification_version: 4
925
925
  summary: Admin interface for the Solidus e-commerce framework.