From 6cdb8c7a9ebd790537510213e43537a4a87189d6 Mon Sep 17 00:00:00 2001 From: Ron Lavi <1ronlavi@gmail.com> Date: Wed, 1 Mar 2023 15:37:08 +0200 Subject: [PATCH] Fixes #35949 - move select_multiple_puppet_proxy to the puppet plugin --- app/helpers/puppet_related_helper.rb | 13 ------------- .../hosts/select_multiple_puppet_proxy.html.erb | 5 ----- test/helpers/host_groups_helper_test.rb | 1 - 3 files changed, 19 deletions(-) delete mode 100644 app/helpers/puppet_related_helper.rb delete mode 100644 app/views/hosts/select_multiple_puppet_proxy.html.erb diff --git a/app/helpers/puppet_related_helper.rb b/app/helpers/puppet_related_helper.rb deleted file mode 100644 index e35f1022678..00000000000 --- a/app/helpers/puppet_related_helper.rb +++ /dev/null @@ -1,13 +0,0 @@ -module PuppetRelatedHelper - UI.register_host_description do - multiple_actions_provider :puppet_actions - end - - def puppet_actions - actions = [] - if authorized_for(:controller => :hosts, :action => :edit) - actions << { :action => [_('Change Puppet CA'), select_multiple_puppet_ca_proxy_hosts_path], :priority => 1051 } if SmartProxy.unscoped.authorized.with_features("Puppet CA").exists? - end - actions - end -end diff --git a/app/views/hosts/select_multiple_puppet_proxy.html.erb b/app/views/hosts/select_multiple_puppet_proxy.html.erb deleted file mode 100644 index 9a7a0743bcb..00000000000 --- a/app/views/hosts/select_multiple_puppet_proxy.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -<%= render 'selected_hosts', :hosts => @hosts %> - -<%= form_for :proxy, :url => update_multiple_puppet_proxy_hosts_path(:host_ids => params[:host_ids]) do |f| %> - <%= multiple_proxy_select(f, 'Puppet') %> -<% end %> diff --git a/test/helpers/host_groups_helper_test.rb b/test/helpers/host_groups_helper_test.rb index b19c1109feb..c85c4cf8344 100644 --- a/test/helpers/host_groups_helper_test.rb +++ b/test/helpers/host_groups_helper_test.rb @@ -1,7 +1,6 @@ require 'test_helper' class HostGroupsHelperTest < ActionView::TestCase - include PuppetRelatedHelper include HostsAndHostgroupsHelper include ApplicationHelper include HostsHelper