Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions app/presenters/tree_builder_automate.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ def root_options

def set_locals_for_render
locals = super
locals.merge!(:id_prefix => "",
:onclick => "miqOnClickSelectAETreeNode",
locals.merge!(:onclick => "miqOnClickSelectAETreeNode",
:exp_tree => false,
:autoload => true,
:base_id => "root",
Expand Down
3 changes: 1 addition & 2 deletions app/presenters/tree_builder_belongs_to_hac.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ def tree_init_options(_tree_name)

def set_locals_for_render
locals = super
locals.merge!(:id_prefix => 'hac_',
:check_url => "/ops/rbac_group_field_changed/#{@group.present? ? @group.id : "new"}___",
locals.merge!(:check_url => "/ops/rbac_group_field_changed/#{@group.present? ? @group.id : "new"}___",
:oncheck => @edit ? "miqOnCheckUserFilters" : nil,
:checkboxes => true,
:highlight_changes => true,
Expand Down
5 changes: 0 additions & 5 deletions app/presenters/tree_builder_belongs_to_vat.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@ def override(node, object, _pid, options)
end
end

def set_locals_for_render
locals = super
locals.merge!(:id_prefix => 'vat_')
end

def x_get_tree_datacenter_kids(parent, count_only)
kids = []
parent.folders.each do |child|
Expand Down
3 changes: 2 additions & 1 deletion app/presenters/tree_builder_infra_networking.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ def tree_init_options(_)

def set_locals_for_render
locals = super
locals.merge!(:id_prefix => 'nt_', :autoload => true)
locals[:autoload] = true
locals
end

def root_options
Expand Down
1 change: 0 additions & 1 deletion app/presenters/tree_builder_miq_action_category.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ def tree_init_options(_tree_name)
def set_locals_for_render
locals = super
locals.merge!(
:id_prefix => "cat_tree",
:click_url => "/miq_policy/action_tag_pressed/",
:onclick => "miqOnClickTagCat"
)
Expand Down
3 changes: 1 addition & 2 deletions app/presenters/tree_builder_tags.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ def selected_entry_value(category, entry)

def set_locals_for_render
locals = super
locals.merge!(:id_prefix => 'tags_',
:check_url => "/ops/rbac_group_field_changed/#{@group.present? ? @group.id : "new"}___",
locals.merge!(:check_url => "/ops/rbac_group_field_changed/#{@group.present? ? @group.id : "new"}___",
:oncheck => @edit.nil? ? nil : "miqOnCheckUserFilters",
:checkboxes => true,
:highlight_changes => true,
Expand Down
1 change: 0 additions & 1 deletion spec/presenters/tree_builder_belongs_to_hac_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
expect(subject.send(:set_locals_for_render)).to include(:onclick => false,
:tree_state => true,
:checkboxes => true,
:id_prefix => "hac_",
:check_url => "/ops/rbac_group_field_changed/#{group.id || "new"}___",
:oncheck => nil,
:highlight_changes => true)
Expand Down
3 changes: 1 addition & 2 deletions spec/presenters/tree_builder_belongs_to_vat_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@
describe '#set_locals_for_render' do
it 'set locals for render correctly' do
locals = subject.send(:set_locals_for_render)
expect(locals).to include(:id_prefix => 'vat_',
:checkboxes => true,
expect(locals).to include(:checkboxes => true,
:check_url => "/ops/rbac_group_field_changed/#{group.id || "new"}___",
:onclick => false,
:oncheck => edit ? "miqOnCheckUserFilters" : nil,
Expand Down
1 change: 0 additions & 1 deletion spec/presenters/tree_builder_miq_action_category_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
describe '#set_locals_for_render' do
it 'set locals for render correctly' do
locals = subject.send(:set_locals_for_render)
expect(locals[:id_prefix]).to eq('cat_tree')
expect(locals[:click_url]).to eq("/miq_policy/action_tag_pressed/")
expect(locals[:onclick]).to eq("miqOnClickTagCat")
end
Expand Down
1 change: 0 additions & 1 deletion spec/presenters/tree_builder_tags_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
end
it 'set locals for render correctly' do
locals = @tags_tree.send(:set_locals_for_render)
expect(locals[:id_prefix]).to eq('tags_')
expect(locals[:checkboxes]).to eq(true)
expect(locals[:check_url]).to eq("/ops/rbac_group_field_changed/#{@group.id || "new"}___")
expect(locals[:highlight_changes]).to eq(true)
Expand Down