Replaced obsolete RBAC test while removing automate instances

Author: romanblanco

app/controllers/miq_ae_class_controller.rb

@@ -1942,23 +1942,17 @@ def process_aeclasses(aeclasses, task)
 
   # Delete all selected or single displayed aeclasses(s)
   def deleteinstances
-    assert_privileges("miq_ae_instance_delete")
-    aeinstances = []
-    @sb[:row_selected] = find_checked_items
-    if @sb[:row_selected]
-      @sb[:row_selected].each do |items|
-        item = items.split('-')
-        item = find_id_with_rbac(MiqAeInstance, item[1])
-        aeinstances.push(item) if item
+    assert_privileges('miq_ae_instance_delete')
+    if (@sb[:row_selected] = find_checked_items).present?
+      ids = @sb[:row_selected].map do |item|
+        item.split('-')[1]
       end
     else
-      node = x_node.split('-')
-      aeinstances.push(node[1])
-      inst = find_record_with_rbac(MiqAeInstance, node[1])
-      self.x_node = "aec-#{inst.class_id}"
+      ids = Array.wrap(x_node.split('-')[1])
     end
-
-    process_aeinstances(aeinstances, "destroy") unless aeinstances.empty?
+    instances = find_records_with_rbac(MiqAeInstance, ids)
+    self.x_node = "aec-#{instances.first.class_id}" if @sb[:row_selected].nil?
+    process_aeinstances(instances.ids, 'destroy')
     replace_right_cell(:replace_trees => [:ae])
   end
 
@@ -1969,23 +1963,17 @@ def process_aeinstances(aeinstances, task)
 
   # Delete all selected or single displayed aeclasses(s)
   def deletemethods
-    assert_privileges("miq_ae_method_delete")
-    aemethods = []
-    @sb[:row_selected] = find_checked_items
-    if @sb[:row_selected]
-      @sb[:row_selected].each do |items|
-        item = items.split('-')
-        item = find_id_with_rbac(MiqAeMethod, item[1])
-        aemethods.push(item) if item
+    assert_privileges('miq_ae_method_delete')
+    if (@sb[:row_selected] = find_checked_items).present?
+      ids = @sb[:row_selected].map do |item|
+        item.split('-')[1]
       end
     else
-      node = x_node.split('-')
-      aemethods.push(node[1])
-      inst = find_record_with_rbac(MiqAeMethod, node[1])
-      self.x_node = "aec-#{inst.class_id}"
+      ids = Array.wrap(x_node.split('-')[1])
     end
-
-    process_aemethods(aemethods, "destroy") unless aemethods.empty?
+    methods = find_records_with_rbac(MiqAeMethod, ids)
+    self.x_node = "aec-#{methods.first.class_id}" if @sb[:row_selected].nil?
+    process_aemethods(methods.ids, 'destroy')
     replace_right_cell(:replace_trees => [:ae])
   end