klastera 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a198ff3af2a7b61a6a111ba1531bb1e5075cd7ff32a74a6db06b0b27a9a450cb
-  data.tar.gz: 4b7548d0a282a24f72bb96ddd51b9339240f1752d9ca3b9be6d84682546c00ad
+  metadata.gz: 5852cf2afca5ca451495ec4edfc3424c2eef664b6f848bf0bf7160570cefc8e5
+  data.tar.gz: 8d7cdd33fa148b3aa6186953c6e20b49570442229150684da761d6e82c5511c8
 SHA512:
-  metadata.gz: a37bd5892c61181db82859cbb32aa0801e4521b2a5a56cb2f561462b675ae2152916208fc786cee8e18c4141755982a0004cde10751303d5b9bdd41bc632a76a
-  data.tar.gz: cf022a0d10ab1903c527c22efa485993e58f18dee5f1f98cd285a86132baecb6006459659c1c6b3446678dbcbf7bc866a492114daf04423699fcf18f130f2649
+  metadata.gz: 5044d1067b784b9b2a51fc77ddbd173478fc6b157126f13162ae329f4e276a449de01a2f0ef9318bf0dc8371ef933da9ff17e2d9f454446b0e4454663895168d
+  data.tar.gz: a3d59a38ba31e0686e17ce57172ce999527cb0b1f900ae5f93cb5e737c6b42f3e165ad448dfeb4c8a178873c90a354c0c55c67755b6b0228bc5c8ceec57dce11

data/app/models/klastera/concerns/cluster_filter.rb

@@ -5,6 +5,10 @@ module Klastera::Concerns::ClusterFilter
     include ActiveModel::Model
     include ActiveModel::Validations::Callbacks
     attr_accessor :cluster_id
+
+    def kcluster_id
+      self.cluster_id == 'without_cluster' ? nil : self.cluster_id
+    end
   end
   
   module ClassMethods

data/app/views/layouts/klastera/_cluster_filter.html.erb

@@ -7,7 +7,7 @@
   <%=yield(f)%>
 
   <% if cluster_organization.is_in_cluster_mode? %>
-    <% cluster_collection = cluster_clusters.map{|c|[c.name,c.id]} %>
+    <% cluster_collection = cluster_clusters.map{|c|[c.name,(c.id||c.nid)]} %>
     <% if cluster_collection.size > 1 %>
       <div class="inline-label-control-block">
         <%= f.input :cluster_id, collection: cluster_collection, prompt: t('klastera.clusters.all'), label: false, wrapper: false %>

data/config/locales/es.yml

@@ -1,5 +1,6 @@
 es:
   klastera:
+    without_cluster: Sin cluster
     cluster:
       title: Cluster
       id: Cluster ID

data/lib/klastera/version.rb

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

data/lib/klastera.rb

@@ -14,8 +14,18 @@ module Klastera
       scope_klass = scope_klass.where(organization_id: organization)
 
       session_clusters(user,organization) do |clusters|
-        or_without_cluster = organization.required_suborganization_mode? ? "" : " OR cluster_id IS NULL "
-        scope_klass = scope_klass.where("cluster_id IN (?)#{or_without_cluster}",clusters.map{|c|c.id})
+        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?
+          without_clusters = "#{with_clusters.blank? ? '' : ' OR ' }#{scope.table_name}.cluster_id IS NULL"
+        end
+
+        scope_klass = scope_klass.where("#{with_clusters}#{without_clusters}")
       end
 
       scope_klass
@@ -38,10 +48,11 @@ module Klastera
     def session_clusters(user,organization)
       clusters = []
       if organization.is_in_cluster_mode?
-        unless user.can_admin_clusters? || organization.optional_mode?
+        unless user.can_admin_clusters?
           # TODO: 1: return a Cluster::ActiveRecord_Relation and then remove to_a in ::Cluster.of line
           # TODO: 2: fix call to ::Cluster instead of Klastera::Cluster
           clusters = ::ClusterUser.of(user,organization).map{|cu|::Cluster.find(cu.cluster_id)}
+          clusters << ::Cluster.new({nid: :without_cluster, name: I18n.t('klastera.without_cluster')}) if organization.optional_mode?
         else
           # TODO: remove "to_a" after ClusterUser.of result became a Cluster::ActiveRecord_Relation object
           clusters = ::Cluster.of(organization).to_a

metadata

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