Skip to content

Replaced obsolete RBAC test while removing automate instances #4644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 18, 2018
Merged

Replaced obsolete RBAC test while removing automate instances #4644

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fca7ee5
Replaced obsolete RBAC test while removing automate instances
romanblanco Sep 11, 2018
d6eaea1
Review response: corrected Rubocop warnings
romanblanco Sep 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 22 additions & 34 deletions app/controllers/miq_ae_class_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
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}"
end

process_aeinstances(aeinstances, "destroy") unless aeinstances.empty?
assert_privileges('miq_ae_instance_delete')
ids = if (@sb[:row_selected] = find_checked_items).present?
@sb[:row_selected].map do |item|
item.split('-')[1]
end
else
Array.wrap(x_node.split('-')[1])
end
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

Expand All @@ -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
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}"
end

process_aemethods(aemethods, "destroy") unless aemethods.empty?
assert_privileges('miq_ae_method_delete')
ids = if (@sb[:row_selected] = find_checked_items).present?
@sb[:row_selected].map do |item|
item.split('-')[1]
end
else
Array.wrap(x_node.split('-')[1])
end
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

Expand Down