Merge pull request #5902 from skateman/switches-controller

Propagate parent model into GTLs on InfraNetwork switches 🖵 🐞
ManageIQ · Jul 30, 2019 · c613075 · c613075
2 parents ecd4374 + 4ba6f1b
commit c613075
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/app/controllers/infra_networking_controller.rb b/app/controllers/infra_networking_controller.rb
@@ -219,7 +219,7 @@ def host_switches_list(id, model)
       self.x_node = "root"
       get_node_info("root")
     else
-      options = {:model => "Switch", :named_scope => :shareable, :selected_ids => @host_record.switches.pluck(:id)}
+      options = {:model => "Switch", :named_scope => :shareable, :parent => @record}
       process_show_list(options) if @show_list
       @showtype        = 'main'
       @pages           = nil
@@ -235,9 +235,7 @@ def cluster_switches_list(id, model)
       self.x_node = "root"
       get_node_info("root")
     else
-      hosts = @cluster_record.hosts
-      switch_ids = hosts.collect { |host| host.switches.pluck(:id) }
-      options = {:model => "Switch", :named_scope => :shareable, :selected_ids => switch_ids.flatten.uniq}
+      options = {:model => "Switch", :named_scope => :shareable, :parent => @record}
       process_show_list(options) if @show_list
       @showtype        = 'main'
       @pages           = nil
@@ -253,9 +251,7 @@ def provider_switches_list(id, model)
       self.x_node = "root"
       get_node_info("root")
     else
-      hosts = Host.where(:ems_id => @provider_record.id)
-      switch_ids = hosts.collect { |host| host.switches.pluck(:id) }
-      options = {:model => "Switch", :named_scope => :shareable, :selected_ids => switch_ids.flatten.uniq}
+      options = {:model => "Switch", :named_scope => :shareable, :parent => @record}
       process_show_list(options) if @show_list
       @showtype        = 'main'
       @pages           = nil

diff --git a/app/presenters/tree_builder_infra_networking.rb b/app/presenters/tree_builder_infra_networking.rb
@@ -4,6 +4,10 @@ class TreeBuilderInfraNetworking < TreeBuilder
   has_kids_for Switch, [:x_get_tree_switch_kids]
   has_kids_for EmsFolder, [:x_get_tree_folder_kids]
 
+  def override(node, object, _pid, _options)
+    node[:selectable] = false if object.kind_of?(Lan)
+  end
+
   private
 
   def tree_init_options