Archived Openstack instances only in "Archived" tree

https://bugzilla.redhat.com/show_bug.cgi?id=1254636

app/controllers/application_controller.rb

@@ -141,8 +141,8 @@ def change_tab
 
   def build_targets_hash(items, typ = true)
     @targets_hash ||= {}
-    # if array of objects came in
     if typ
+      # if array of objects came in
       items.each do |item|
         @targets_hash[item.id.to_i] = item
       end

app/models/miq_report/search.rb

@@ -100,6 +100,8 @@ def paged_view_search(options = {})
 
     if options[:parent]
       targets = get_parent_targets(options[:parent], options[:association] || options[:parent_method])
+      # filter out archived VMs
+      targets = targets.select { |target| !Vm.find_by(:id => target).archived? unless Vm.find_by(:id => target).nil? }
       if targets.empty?
         search_results, attrs = [targets, {:auth_count => 0, :total_count => 0}]
       else

app/presenters/tree_builder.rb

@@ -404,10 +404,6 @@ def x_build_node(object, pid, options)    # Called with object, tree node parent
         ((object.kind_of?(MiqServer) && MiqServer.my_server(true).id == object.id) ||
          (object.kind_of?(Zone) && MiqServer.my_server(true).my_zone == object.name))
 
-    # # open nodes to show selected automate entry point
-    # x_tree[:open_nodes] = @temp[:open_nodes].dup if @temp && @temp[:open_nodes]
-    # x_tree[:open_nodes] = @open_nodes.dup if @open_nodes
-
     node = x_build_single_node(object, pid, options)
 
     if [:policy_profile_tree, :policy_tree].include?(options[:tree])

app/presenters/tree_builder_instances.rb

@@ -33,6 +33,7 @@ def x_get_tree_ems_kids(object, count_only)
   # Get AvailabilityZone children count/array
   def x_get_tree_az_kids(object, count_only)
     objects = rbac_filtered_objects(object.vms.order("name"))
+    objects = objects.select { |obj| !obj.archived? }
     count_only ? objects.length : objects
   end
 

app/views/layouts/_x_gtl.html.haml

@@ -5,7 +5,7 @@
 
 #gtl_div
   - view ||= @view
-  - table      = view.sub_table ? view.sub_table : view.table unless view.nil?
+  - table = view.sub_table ? view.sub_table : view.table unless view.nil?
   - action_url ||= "explorer"
   - @gtl_type = "grid" if @gtl_type.nil?
   - if view.nil? || table.data.length == 0

spec/models/miq_report_spec.rb

@@ -191,7 +191,9 @@ def invoke_ae
 
       host2 = FactoryGirl.create(:host)
       vmb   = FactoryGirl.create(:vm_vmware, :host => host2, :name => "b")
+      vmb.stub(:archived?) { false }
       vmc   = FactoryGirl.create(:vm_vmware, :host => host2, :name => "c")
+      vmc.stub(:archived?) { false }
 
       report = MiqReport.new(:db => "Vm", :sortby => "name", :order => "Descending")
       results, = report.paged_view_search(