services 6.0.4 → 6.0.5

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 0ec2c9fc6cd987c7aed6c82a1aa34e8d16f4948394f167b53209278eff78805a
4
- data.tar.gz: 9f09eadc6a1b4294b846a5570491a660f1fe6cffed4b294035ec86381ea1af33
3
+ metadata.gz: c3085ae1c41a776a15e333d0afbf240b7509f5921f4e75ceada90e834a8c6e05
4
+ data.tar.gz: 1976cad3543d7f1bb9f5b40507dddde8fa3f805ae189b74a68e843cb68b6b036
5
5
  SHA512:
6
- metadata.gz: 9ccb8ca1e97cc909828425802a9f1ffdba7e291aeabdba29fa5489c4803898a0147f0521b7235a82f2b23e3b139aa2eaf1170aed4ce8142f07aead9b8beb9cea
7
- data.tar.gz: 26a8beb63cba18b20ccecb7894ba0f9c4a260065366d51fdad3d351436a2415734a09695b7402298f0f431976d152baf02475ad60afa1027209b9c522ca9dffe
6
+ metadata.gz: b633bc24e6c9ede452b76301a1f2fb8478160320fe8e982c0527ee078c8d879375e3f610b3247754853aa0c4faa9a043de865ab70b1b6cccc9eadf446fb1f5ab
7
+ data.tar.gz: 2bf7df9ef18291cf448a8a6af7e5e850af1027ba1cbcb223127e021e0b31e5191b988db6a882f3a9a51482adae4818b957c8352e52b07c0361ba0ff1d1940234
@@ -30,7 +30,7 @@ module Services
30
30
  object_table_id = "#{object_class.table_name}.id"
31
31
 
32
32
  special_conditions = conditions.extract!(:id_not, :order, :limit, :page, :per_page)
33
- special_conditions[:order] ||= object_table_id
33
+ special_conditions[:order] = object_table_id unless special_conditions.has_key?(:order)
34
34
 
35
35
  scope = conditions.delete(:scope).try(:dup) || object_class.public_send(ActiveRecord::VERSION::MAJOR == 3 ? :scoped : :all)
36
36
  scope = scope.where(object_table_id => ids) unless ids.empty?
@@ -1,3 +1,3 @@
1
1
  module Services
2
- VERSION = '6.0.4'.freeze
2
+ VERSION = '6.0.5'.freeze
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: services
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.0.4
4
+ version: 6.0.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Manuel Meurer