solidus_backend 3.0.6 → 3.0.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: dc6c54007c56cf228ae4adf6db13ca7023e14268fd4d50f7988bacd6665530d3
4
- data.tar.gz: 55e40b3a4e73ef425ea200005d7dc7fcd171d174047fb719893e1fe574b7bdc5
3
+ metadata.gz: fab64fa4b8eb0932e3fb616f4b369516d94e733480d3c28511ee0b32da4f2a0a
4
+ data.tar.gz: 5f26f407eabfbf710f0a5f7cb28a75a80415b38647ef572937dc6d03fab67ed6
5
5
  SHA512:
6
- metadata.gz: acd5045ee15211e7d2cd7fc7e7018e8dc54a5cd2f2982d731ab57fb152aa9245087aaa7681db91d6008b560dd346212ed575bb46395b121018130560eae8cd49
7
- data.tar.gz: 9ba222825a7f9800cffbeb5a54b05d4266e8cac5abe4d93ceae8e51e1dfc05f1f84b94d8d5a93b6a906e136e9e5b345702a3392e7f8a210c48694e45dc9ce02b
6
+ metadata.gz: ebc5bd3117563bfcc2f382406f92339c9c93bcaed1c4e604dc66dd163d79159d18a6e096c5719c4935b40826cb4d36661a69525346bf33975b6fda3684874f92
7
+ data.tar.gz: 38d30d5f044f9cf732b09d1fb8a314b5291788f1d39a81d98c4bc2c1632edbd09ded46866ef9e9eb47f4a15cce1680b838aead0009458ffec0835677fdcfbc78
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.0.6
4
+ version: 3.0.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.0.6
19
+ version: 3.0.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.0.6
26
+ version: 3.0.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.0.6
33
+ version: 3.0.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.0.6
40
+ version: 3.0.7
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.