Fixed code to load listnav and advanced search for new screens.

- also some further deletion of redundant code
ManageIQ · Mar 24, 2020 · 35cca40 · 35cca40
1 parent 304da55
commit 35cca40
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 9 deletions.
diff --git a/app/controllers/application_controller/advanced_search.rb b/app/controllers/application_controller/advanced_search.rb
@@ -185,10 +185,7 @@ def adv_search_redraw_listnav_and_main
   end
 
   def adv_search_redraw_left_div
-    if x_active_tree.to_s == "configuration_manager_cs_filter_tree"
-      build_accordions_and_trees
-      load_or_clear_adv_search
-    elsif @edit[:in_explorer] || %w[storage_tree configuration_scripts_tree svcs_tree].include?(x_active_tree.to_s)
+    if @edit[:in_explorer] || %w[storage_tree configuration_scripts_tree svcs_tree].include?(x_active_tree.to_s)
       tree_type = x_active_tree.to_s.sub(/_tree/, '').to_sym
       builder = TreeBuilder.class_for_type(tree_type)
       tree = builder.new(x_active_tree, @sb)

diff --git a/app/controllers/mixins/automation_manager_controller_mixin.rb b/app/controllers/mixins/automation_manager_controller_mixin.rb
@@ -251,7 +251,7 @@ def provider_list(id, model)
     def configured_system_list(id, model)
       return configured_system_node(id, model) if id
 
-      if x_active_tree == :configuration_manager_cs_filter_tree || x_active_tree == :automation_manager_cs_filter_tree
+      if x_active_tree == :automation_manager_cs_filter_tree
         options = {:model => model.to_s}
         @right_cell_text = _("All %{title} Configured Systems") % {:title => self.class.model_to_name(model)}
         process_show_list(options)

diff --git a/app/controllers/mixins/sandbox.rb b/app/controllers/mixins/sandbox.rb
@@ -49,8 +49,6 @@ def x_active_tree
     condition_tree
     containers_tree
     containers_filter_tree
-    configuration_manager_cs_filter_tree
-    configuration_manager_providers_tree
     customization_templates_tree
     datacenter_tree
     datastore_tree

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -1187,9 +1187,7 @@ def tree_with_advanced_search?
     %i[
       automation_manager_providers_tree
       automation_manager_cs_filter_tree
-      configuration_manager_cs_filter_tree
       configuration_scripts_tree
-      configuration_manager_providers_tree
       images_tree
       images_filter_tree
       instances_tree

diff --git a/app/helpers/application_helper/listnav.rb b/app/helpers/application_helper/listnav.rb
@@ -15,6 +15,8 @@ def render_listnav_filename
         cloud_volume_snapshot
         cloud_volume_type
         configuration_job
+        configuration_manager
+        configuration_profile
         configured_system
         container
         container_build

diff --git a/app/helpers/application_helper/page_layouts.rb b/app/helpers/application_helper/page_layouts.rb
@@ -173,6 +173,7 @@ def show_adv_search?
       cloud_volume_snapshot
       cloud_volume_type
       configuration_job
+      configuration_manager
       configured_system
       container
       container_build