nix the all_vm_or_templates callers

fixes `ManageIQ::Providers::Google::CloudManager Inst Including Associations (0.1ms - 1rows) [----] F, [2020-06-17T13:58:28.726000 #394303:ae790] FATAL -- : Error caught: [NoMethodError] undefined method 'all_vms_and_templates'` from ManageIQ/manageiq#20284 broken in ManageIQ/manageiq#20149
d-m-u · Jun 17, 2020 · 6b38524 · 6b38524
1 parent 67e4ffd
commit 6b38524
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1403,7 +1403,7 @@ def get_view_pages(dbname, view)
 
   def get_db_view(db, options = {})
     if %w[ManageIQ_Providers_InfraManager_Template ManageIQ_Providers_InfraManager_Vm]
-       .include?(db) && options[:association] == "all_vms_and_templates"
+       .include?(db) && options[:association] == "vms_and_templates"
       options[:association] = nil
     end
 

diff --git a/app/controllers/vm_common.rb b/app/controllers/vm_common.rb
@@ -1019,7 +1019,7 @@ def list_child_vms(model, node_id, title, show_list)
                          end
     else
       rec = TreeBuilder.get_model_for_prefix(@nodetype).constantize.find(node_id)
-      options[:association] = @nodetype == 'az' ? 'vms' : 'all_vms_and_templates'
+      options[:association] = @nodetype == 'az' ? 'vms' : 'vms_and_templates'
       options[:parent] = rec
       options[:named_scope] << :active