Skip to content

[WIP] fix widgets serializing role names that could change #9710

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP] fix widgets serializing role names that could change #9710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 4 additions & 11 deletions app/controllers/report_controller/widgets.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,9 +292,8 @@ def widget_get_node_info
if @widget.visibility && @widget.visibility[:roles]
@sb[:user_roles] = []
if @widget.visibility[:roles][0] != "_ALL_"
Rbac.filtered(MiqUserRole).sort_by(&:name).each do |r|
@sb[:user_roles].push(r.name) if @widget.visibility[:roles].include?(r.name)
end
role_ids = @widget.visibility[:roles]
@sb[:user_roles] = Rbac.filtered(MiqUserRole.where(:id => role_ids)).order(:name).pluck(:name)
end
elsif @widget.visibility && @widget.visibility[:groups]
@sb[:groups] = []
Expand Down Expand Up @@ -335,8 +334,7 @@ def widget_set_form_vars
if @widget.visibility[:roles][0] == "_ALL_"
@edit[:new][:roles] = ["_ALL_"]
else
roles = Rbac.filtered(MiqUserRole.where(:name => @widget.visibility[:roles]))
@edit[:new][:roles] = roles.collect(&:id).sort
@edit[:new][:roles] = @widget.visibility[:roles].sort
end
elsif @widget.visibility[:groups]
@edit[:new][:visibility_typ] = "group"
Expand Down Expand Up @@ -573,12 +571,7 @@ def widget_set_record_vars(widget)
widget.visibility.delete(:roles) if widget.visibility[:roles]
else
if @edit[:new][:visibility_typ] == "role"
roles = []
@edit[:new][:roles].each do |r|
role = MiqUserRole.find(r)
roles.push(role.name) if r == role.id.to_s
end
widget.visibility[:roles] = roles
widget.visibility[:roles] = @edit[:new][:roles]
else
widget.visibility[:roles] = ["_ALL_"]
end
Expand Down
2 changes: 1 addition & 1 deletion spec/controllers/report_controller/widget_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
@edit_hash[:new][:visibility_typ] = 'role'
@edit_hash[:new][:roles] = [role.id.to_s]
controller.send(:widget_set_record_vars, @widget)
expect(@widget.visibility[:roles]).to eq([role.name])
expect(@widget.visibility[:roles]).to eq([role.id.to_s])
end

it "sets group visibility for widget" do
Expand Down