klastera 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5852cf2afca5ca451495ec4edfc3424c2eef664b6f848bf0bf7160570cefc8e5
-  data.tar.gz: 8d7cdd33fa148b3aa6186953c6e20b49570442229150684da761d6e82c5511c8
+  metadata.gz: 9bd206c969548ea6d299cb57564aa67e9f7b88a5ba753ad5d0c112b7670ad4f0
+  data.tar.gz: 62580be564273b2a461808c9edbe2e9ef6c1cefa88f8b813ec9d2d02441a0836
 SHA512:
-  metadata.gz: 5044d1067b784b9b2a51fc77ddbd173478fc6b157126f13162ae329f4e276a449de01a2f0ef9318bf0dc8371ef933da9ff17e2d9f454446b0e4454663895168d
-  data.tar.gz: a3d59a38ba31e0686e17ce57172ce999527cb0b1f900ae5f93cb5e737c6b42f3e165ad448dfeb4c8a178873c90a354c0c55c67755b6b0228bc5c8ceec57dce11
+  metadata.gz: d5f9073b9968cab43d2a88be5d1bcb9ac4cb6254670b480ac2adeadbe9c00bef78cd35a022f52626c75157844f9ad428c26afaab33b73b55e51b1bcfd0f0c682
+  data.tar.gz: 900d61f55072bfc19110dc4efda73c996dd7ec57e327165279e2c15b5eb86352c1f1aa98a28130b2b1f87a7d753a7891b388badee4a7771e6249fd758b662f5e

data/lib/klastera.rb

@@ -15,17 +15,15 @@ module Klastera
 
       session_clusters(user,organization) do |clusters|
         clusters = clusters.reject{|c|c.id.blank?}
-        with_clusters = nil; without_clusters = nil
 
-        if organization.required_suborganization_mode? || clusters.present?
-          with_clusters = "#{scope.table_name}.cluster_id IN (#{clusters.map(&:id).join(',')})"
-        end
-
-        if organization.optional_mode?
+        if organization.required_suborganization_mode?
+          scope_klass = scope_klass.where("#{scope.table_name}.cluster_id IN (?)",clusters)
+        elsif organization.optional_mode?
+          with_clusters = clusters.present? ? "#{scope.table_name}.cluster_id IN (#{clusters.map(&:id).join(',')})" : nil
           without_clusters = "#{with_clusters.blank? ? '' : ' OR ' }#{scope.table_name}.cluster_id IS NULL"
+          scope_klass = scope_klass.where("#{with_clusters}#{without_clusters}")
         end
 
-        scope_klass = scope_klass.where("#{with_clusters}#{without_clusters}")
       end
 
       scope_klass

data/lib/klastera/version.rb

@@ -1,3 +1,3 @@
 module Klastera
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: klastera
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Gino Barahona
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-07 00:00:00.000000000 Z
+date: 2020-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails