Skip to content

Commit

Permalink
Merge pull request #6147 from ZitaNemeckova/fix_ae_miq_request
Browse files Browse the repository at this point in the history
Set typ of tab before checking privilegies
  • Loading branch information
mzazrivec authored Sep 10, 2019
2 parents 4d1363a + fc0dcf1 commit d806e2f
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions app/controllers/miq_request_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -461,8 +461,11 @@ def approver?
end

def rbac_feature_id(feature_id)
return feature_id unless %w[ae host].include?(session[:request_tab])
"#{session[:request_tab]}_#{feature_id}"
# set this to be used to identify which Requests subtab was clicked
@request_tab = params[:typ] || session[:request_tab] if @request_tab.nil?
return feature_id unless %w[ae host].include?(@request_tab)

"#{@request_tab}_#{feature_id}"
end

# Delete all selected or single displayed action(s)
Expand Down

0 comments on commit d806e2f

Please sign in to comment.