Do not display child services in the services tree

ManageIQ · Mar 15, 2017 · 1bc9257 · 1bc9257
1 parent 2ee6e81
commit 1bc9257
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/app/controllers/service_controller.rb b/app/controllers/service_controller.rb
@@ -225,7 +225,7 @@ def get_node_info(treenodeid)
         process_show_list(:where_clause => "ancestry is null")
         @right_cell_text = _("Active Services")
       else
-        process_show_list(:where_clause => "retired is true")
+        process_show_list(:where_clause => "retired is true and ancestry is null")
         @right_cell_text = _("Retired Services")
       end
     else      # Get list of child Catalog Items/Services of this node

diff --git a/app/presenters/tree_builder_services.rb b/app/presenters/tree_builder_services.rb
@@ -6,7 +6,6 @@ class TreeBuilderServices < TreeBuilder
   def tree_init_options(_tree_name)
     {
       :leaf     => "Service",
-      :full_ids => true,
       :add_root => false
     }
   end
@@ -37,7 +36,7 @@ def x_get_tree_roots(count_only, _options)
   end
 
   def x_get_tree_custom_kids(object, count_only, _options)
-    services = Rbac.filtered(Service.where(:retired => object[:id] != 'asrv'))
+    services = Rbac.filtered(Service.where(:retired => object[:id] != 'asrv', :ancestry => [nil, ""]))
     if count_only
       services.size
     else