Merge pull request #14414 from lgalis/services_sync_tree_and_list_dis…

…play [EUWE] Display the same services in the tree as in the right-side list
ManageIQ · Mar 20, 2017 · 9982a90 · 9982a90
2 parents 61d2ecf + 20ef367
commit 9982a90
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/app/presenters/tree_builder_services.rb b/app/presenters/tree_builder_services.rb
@@ -21,7 +21,7 @@ def root_options
 
   # Get root nodes count/array for explorer tree
   def x_get_tree_roots(count_only, _options)
-    all_services = Rbac.filtered(Service.where(:display => true))
+    all_services = Rbac.filtered(Service.where(:ancestry => [nil, ""]))
     if count_only
       all_services.size
     else

diff --git a/spec/presenters/tree_builder_services_spec.rb b/spec/presenters/tree_builder_services_spec.rb
@@ -5,16 +5,11 @@
     create_deep_tree
 
     expect(root_nodes).to eq(
-      @service => {
-        @service_c1 => {
-          @service_c11 => {},
-          @service_c12 => {
-            @service_c121 => {}
-          }
-        },
-        @service_c2 => {}
-      }
-    )
+      @service => {},
+      @service_c1 => {},
+      @service_c2 => {},
+      @service_c3 => {}
+      )
   end
 
   private
@@ -29,12 +24,11 @@ def kid_nodes(node)
 
   def create_deep_tree
     @service      = FactoryGirl.create(:service, :display => true)
-    @service_c1   = FactoryGirl.create(:service, :service => @service, :display => true)
+    @service_c1   = FactoryGirl.create(:service, :display => true)
     @service_c11  = FactoryGirl.create(:service, :service => @service_c1, :display => true)
     @service_c12  = FactoryGirl.create(:service, :service => @service_c1, :display => true)
     @service_c121 = FactoryGirl.create(:service, :service => @service_c12, :display => true)
-    @service_c2   = FactoryGirl.create(:service, :service => @service, :display => true)
-    # hidden
-    @service_c3   = FactoryGirl.create(:service, :service => @service, :display => false)
+    @service_c2   = FactoryGirl.create(:service, :display => true)
+    @service_c3   = FactoryGirl.create(:service, :display => false)
   end
 end