klastera 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12536c20cf2d30bd60e704036cd40ffc688caee158a0802fa39713e6e46c4c49
-  data.tar.gz: 5b945c20beba1467597764507a6aaa373287c3c50663fa0d115f92d4d310d47b
+  metadata.gz: 568f218d96580bb10036134ae396871cf9db198f6d905ccc97edf835330572ba
+  data.tar.gz: 74ea879bcd781b13a0beb7513c56c008037860479aee43c0342df8375ab38a3d
 SHA512:
-  metadata.gz: 0a6d3198aa48188ad3d7e847070a23bd84876de19f81ddcc34d44ed906ab274f2b678c4228e023bc2294ba36defb49a1518cb057905675ad97a243f7bf5c8b27
-  data.tar.gz: 76183a671d08a2eca8885425562a7e93e2196c72f6405984239a28cd872ef53d83f16dd78a3a48b720b2a6ad15a5d72e3912a83928e5099fc0756c2d6c46ce75
+  metadata.gz: c2220db1e8c1e4aad4b6b7f05150bb24d833cde5a234ba6c1246ae38f3135db1f7b9b5f7085a0251758e2347d90bbdd013a8fd754ddb4a50289059677b1efe1d
+  data.tar.gz: 8eb5679f6cb3e2c96c682f17a9826cac713d9fe6550e158df88d1a2113f1896dc2c2140b273f8040eaef158d0e4c2bd25ba16a84b5e0f34a39485aec4333f6fc

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

@@ -52,6 +52,10 @@ module Klastera::Concerns::Cluster
       end
       can_destroy
     end
+
+    def display_name_nid
+      "#{name} (#{nid})"
+    end
   end
   
   module ClassMethods

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

@@ -28,7 +28,7 @@ module Klastera::Concerns::User
     def is_not_a_cluster_user?; ! self.is_a_cluster_user?; end
 
     def need_cluster_assignation?
-      self.try(:organization).try(:is_in_cluster_mode?) && self.is_a_cluster_user?
+      self.try(:organization).try(:required_suborganization_mode?) && self.is_a_cluster_user?
     end
 
     def can_admin_clusters?

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 %>
+    <% cluster_collection = cluster_clusters.map{|c|[c.name,c.id]} %>
     <% 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/app/views/layouts/klastera/_cluster_selector.html.erb

@@ -1,14 +1,20 @@
-<% other_visibility_reason = other_visibility_reason.nil? ? false : other_visibility_reason %>
+<%
+  f = f.nil? ? nil : f
+  other_visibility_reason = other_visibility_reason.nil? ? false : other_visibility_reason
+%>
 <% if cluster_organization.is_in_cluster_mode? || other_visibility_reason %>
   <% 
     cluster_collection = cluster_clusters
-    label = t('klastera.cluster.id')
+    label = t('klastera.cluster.title')
   %>
-  <% if f.is_a?(SimpleForm::FormBuilder) %>
+  <% if f.nil? %>
+    <%= label_tag(:cluster_id, label, class: 'control-label') %>
+    <%= select_tag(:cluster_id, options_from_collection_for_select(cluster_collection, 'id', 'display_name_nid'), class: 'form-control', prompt: 'Seleccione') %>
+  <% elsif f.is_a?(SimpleForm::FormBuilder) %>
     <% if cluster_collection.size == 1 %>
       <%= f.input :lonely_cluster, as: :hidden, html_input: { value: true } %>
     <% else %>
-      <%= f.input :cluster_id, collection: cluster_collection, label: label %>
+      <%= f.input :cluster_id, collection: cluster_collection.map{|c|[c.name,c.id]}, label: label %>
     <% end %>
   <% else %>
     <% if cluster_collection.size == 1 %>
@@ -16,7 +22,7 @@
     <% else %>
       <div class="form-group">
         <%= f.label label %>
-        <%= f.select :cluster_id, cluster_collection, { include_blank: true }, { class: 'form-control' } %>
+        <%= f.select :cluster_id, cluster_collection.map{|c|[c.name,c.id]}, { include_blank: true }, { class: 'form-control' } %>
       </div>
     <% end %>
   <% end %>

data/lib/klastera/version.rb

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

data/lib/klastera.rb

@@ -40,7 +40,7 @@ module Klastera
       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|cu.cluster}
+          clusters = ::ClusterUser.of(user,organization).map{|cu|::Cluster.find(cu.cluster_id)} # TODO: fix call to ::Cluster instead of Klastera::Cluster
         else
           # TODO: remove "to_a" after ClusterUser.of result became a Cluster::ActiveRecord_Relation object
           clusters = ::Cluster.of(organization).to_a
@@ -58,6 +58,7 @@ module Klastera
       helper_method :cluster_user
       helper_method :cluster_organization
       helper_method :cluster_clusters
+      # helper_method :cluster_clusters_ids
     end
     if respond_to?(:hide_action)
       hide_action :cluster_scope
@@ -70,6 +71,8 @@ module Klastera
       hide_action :cluster_organization=
       hide_action :cluster_clusters
       hide_action :cluster_clusters=
+      # hide_action :cluster_clusters_ids
+      # hide_action :cluster_clusters_ids=
     end
     before_action :set_the_lonely_cluster, only: %i[ create update ]
   end
@@ -96,9 +99,13 @@ module Klastera
   end
 
   def cluster_clusters
-    Klastera.session_clusters(cluster_user,cluster_organization).map{|c|[c.name,c.id]}
+    Klastera.session_clusters(cluster_user,cluster_organization)
   end
 
+  # def cluster_clusters_ids
+  #   cluster_clusters.map(&:id)
+  # end
+
   def set_cluster_filter
     @filter = ::ClusterFilter.new(cluster_filter_params)
   end

metadata

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