Skip to content

Replaced obsolete method for record fetching with RBAC in application controller #4598

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 6, 2018
Merged

Replaced obsolete method for record fetching with RBAC in application controller #4598

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8fb9f1
Replaced obsolete method for record fetching with RBAC in application
romanblanco Sep 4, 2018
8f8f155
Removed dead code (dead after acb43161bddc0ea856c13092891eb4bd43e2ec11)
romanblanco Sep 6, 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
32 changes: 5 additions & 27 deletions app/controllers/application_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1740,32 +1740,11 @@ def prov_redirect(typ = nil)
# non-explorer screens will perform render in their respective button method
return if flash_errors?
@in_a_form = true
if request.parameters[:pressed].starts_with?("host_") # need host id for host prov
@org_controller = "host" # request originated from controller
klass = Host
@refresh_partial = "prov_edit"
if params[:id]
@prov_id = find_id_with_rbac(Host, params[:id])
else
@prov_id = find_checked_ids_with_rbac(Host).map(&:to_i).uniq
res = Host.ready_for_provisioning?(@prov_id)
if res != true
res.each do |field, msg|
add_flash("#{field.to_s.capitalize} #{msg}", :error)
end
@redirect_controller = "host"
@refresh_partial = "show_list"
end
end
else
@template_klass_type = template_types_for_controller
@org_controller = "vm" # request originated from controller
klass = VmOrTemplate
@refresh_partial = typ ? "prov_edit" : "pre_prov"
end
@template_klass_type = template_types_for_controller
@org_controller = "vm" # request originated from controller
@refresh_partial = typ ? "prov_edit" : "pre_prov"
if typ
vms = find_checked_ids_with_rbac(klass)
@prov_id = vms.empty? ? find_id_with_rbac(klass, params[:id]) : vms[0]
@prov_id = find_record_with_rbac(VmOrTemplate, checked_or_params).id
case typ
when "clone"
@prov_type = "clone_to_vm"
Expand All @@ -1787,8 +1766,7 @@ def prov_redirect(typ = nil)
if %w(image_miq_request_new miq_template_miq_request_new).include?(params[:pressed])
# skip pre prov grid
set_pre_prov_vars
template = find_checked_records_with_rbac(VmOrTemplate).first
template = find_record_with_rbac(VmOrTemplate, params[:id]) if template.nil?
template = find_record_with_rbac(VmOrTemplate, checked_or_params)

render_flash_not_applicable_to_model("provisioning") unless template.supports_provisioning?
return if performed?
Expand Down