Merge pull request #5406 from skateman/treebuilder-database-active

Do not inherit the TreeBuilderOpsVmdb from TreeBuilderOps
ManageIQ · Apr 1, 2019 · aff6aaa · aff6aaa
2 parents 02c3e39 + 131bb99
commit aff6aaa
Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/app/presenters/tree_builder_ops.rb b/app/presenters/tree_builder_ops.rb
@@ -5,13 +5,7 @@ class TreeBuilderOps < TreeBuilder
   private
 
   def active_node_set(_tree_nodes)
-    # FIXME: check all below
-    case @name
-    when :vmdb_tree
-      @tree_state.x_node_set("root", @name)
-    else
-      @tree_state.x_node_set("svr-#{MiqServer.my_server(true).id}", @name) unless @tree_state.x_node(@name)
-    end
+    @tree_state.x_node_set("svr-#{MiqServer.my_server(true).id}", @name) unless @tree_state.x_node(@name)
   end
 
   def x_get_tree_zone_kids(object, count_only)

diff --git a/app/presenters/tree_builder_ops_vmdb.rb b/app/presenters/tree_builder_ops_vmdb.rb
@@ -1,4 +1,4 @@
-class TreeBuilderOpsVmdb < TreeBuilderOps
+class TreeBuilderOpsVmdb < TreeBuilder
   has_kids_for VmdbTableEvm, %i(x_get_tree_vmdb_table_kids options)
 
   private