klastera 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 568f218d96580bb10036134ae396871cf9db198f6d905ccc97edf835330572ba
-  data.tar.gz: 74ea879bcd781b13a0beb7513c56c008037860479aee43c0342df8375ab38a3d
+  metadata.gz: a198ff3af2a7b61a6a111ba1531bb1e5075cd7ff32a74a6db06b0b27a9a450cb
+  data.tar.gz: 4b7548d0a282a24f72bb96ddd51b9339240f1752d9ca3b9be6d84682546c00ad
 SHA512:
-  metadata.gz: c2220db1e8c1e4aad4b6b7f05150bb24d833cde5a234ba6c1246ae38f3135db1f7b9b5f7085a0251758e2347d90bbdd013a8fd754ddb4a50289059677b1efe1d
-  data.tar.gz: 8eb5679f6cb3e2c96c682f17a9826cac713d9fe6550e158df88d1a2113f1896dc2c2140b273f8040eaef158d0e4c2bd25ba16a84b5e0f34a39485aec4333f6fc
+  metadata.gz: a37bd5892c61181db82859cbb32aa0801e4521b2a5a56cb2f561462b675ae2152916208fc786cee8e18c4141755982a0004cde10751303d5b9bdd41bc632a76a
+  data.tar.gz: cf022a0d10ab1903c527c22efa485993e58f18dee5f1f98cd285a86132baecb6006459659c1c6b3446678dbcbf7bc866a492114daf04423699fcf18f130f2649

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

@@ -32,6 +32,10 @@ module Klastera::Concerns::Organization
     def optional_filter_mode?
       cluster_mode == ::Cluster::MODES.third
     end
+
+    def optional_mode?
+      optional_suborganization_mode? || optional_filter_mode?
+    end
   end
   
   module ClassMethods

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

@@ -1,4 +1,4 @@
-<% if @user.try(:need_cluster_assignation?) %>
+<% if @user.try(:is_a_cluster_user?) %>
   <div class="panel panel-default">
     <div class="panel-heading">
       <h4 class="panel-title">

data/lib/klastera/version.rb

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

data/lib/klastera.rb

@@ -38,9 +38,10 @@ module Klastera
     def session_clusters(user,organization)
       clusters = []
       if organization.is_in_cluster_mode?
-        unless user.can_admin_clusters?
-          # TODO: return a Cluster::ActiveRecord_Relation and then remove to_a in ::Cluster.of line
-          clusters = ::ClusterUser.of(user,organization).map{|cu|::Cluster.find(cu.cluster_id)} # TODO: fix call to ::Cluster instead of Klastera::Cluster
+        unless user.can_admin_clusters? || organization.optional_mode?
+          # 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)}
         else
           # TODO: remove "to_a" after ClusterUser.of result became a Cluster::ActiveRecord_Relation object
           clusters = ::Cluster.of(organization).to_a

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klastera
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Gino Barahona