Merge pull request #1534 from ZitaNemeckova/tag_ansible

Add Tags to Ansible Tower Provider and Foreman Provider

app/controllers/application_controller.rb

@@ -2210,6 +2210,10 @@ def controller_for_common_methods
     case controller_name
     when "vm_infra", "vm_or_template", "vm_cloud"
       "vm"
+    when 'automation_manager'
+      "automation_manager_provider"
+    when 'provider_foreman'
+      "configuration_manager_provider"
     else
       controller_name
     end

app/controllers/application_controller/explorer.rb

@@ -66,7 +66,7 @@ def x_history
   def x_button
     model, action = pressed2model_action(params[:pressed])
 
-    allowed_models = %w(common image instance vm miq_template provider storage configscript infra_networking)
+    allowed_models = %w(common image instance vm miq_template provider storage configscript infra_networking automation_manager_provider configuration_manager_provider)
     raise ActionController::RoutingError.new('invalid button action') unless
       allowed_models.include?(model)
 
@@ -94,6 +94,8 @@ def x_button
           send(method, Storage)
         when 'infra_networking'
           send(method, Switch)
+        when 'automation_manager_provider', 'configuration_manager_provider'
+          send(method)
         else
           send(method, VmOrTemplate)
         end

app/controllers/application_controller/tags.rb

@@ -25,6 +25,14 @@ def container_tag
     tagging_edit('Container')
   end
 
+  def automation_manager_provider_tag
+    tagging_edit('ManageIQ::Providers::AnsibleTower::AutomationManager')
+  end
+
+  def configuration_manager_provider_tag
+    tagging_edit('ManageIQ::Providers::ConfigurationManager')
+  end
+
   alias_method :image_tag, :tagging_edit
   alias_method :instance_tag, :tagging_edit
   alias_method :vm_tag, :tagging_edit

app/controllers/automation_manager_controller.rb

@@ -19,10 +19,6 @@ def self.table_name
     @table_name ||= "automation_manager"
   end
 
-  CM_X_BUTTON_ALLOWED_ACTIONS = {
-    'configscript_service_dialog' => :configscript_service_dialog,
-  }.freeze
-
   def self.model_to_name(provmodel)
     if provmodel.include?("ManageIQ::Providers::AnsibleTower")
       Dictionary.gettext('ansible_tower', :type => :ui_title, :translate => false)
@@ -50,8 +46,8 @@ def tagging
     @explorer ||= true
     case x_active_accord
     when :automation_manager_providers
-      assert_privileges("automation_manager_provider_configured_system_tag")
-      tagging_edit('ConfiguredSystem', false)
+      assert_privileges("automation_manager_provider_tag")
+      tagging_edit('ManageIQ::Providers::AnsibleTower::AutomationManager', false)
     when :automation_manager_cs_filter
       assert_privileges("automation_manager_configured_system_tag")
       tagging_edit('ConfiguredSystem', false)

app/controllers/mixins/manager_controller_mixin.rb

@@ -285,7 +285,15 @@ def form_fields
 
     private
 
+    def tag_action
+      (params[:action] == 'x_button' && %w(automation_manager_provider_tag configuration_manager_provider_tag).include?(params[:pressed])) || (params[:action] == 'tagging' && params[:pressed] == 'reset')
+    end
+
     def replace_right_cell(options = {})
+      if tag_action
+        render_tagging_form
+        return
+      end
       replace_trees = options[:replace_trees]
       return if @in_a_form
       @explorer = true

app/controllers/provider_foreman_controller.rb

@@ -69,8 +69,8 @@ def tagging
     @explorer = true
     case x_active_accord
     when :configuration_manager_providers
-      assert_privileges("provider_foreman_configured_system_tag")
-      tagging_edit('ConfiguredSystem', false)
+      assert_privileges("configuration_manager_provider_tag")
+      tagging_edit('ManageIQ::Providers::ConfigurationManager', false)
     when :configuration_manager_cs_filter
       assert_privileges("configured_system_tag")
       tagging_edit('ConfiguredSystem', false)

app/helpers/application_helper.rb

@@ -922,7 +922,7 @@ def adv_search_show_alias_checkbox?
   end
 
   def pressed2model_action(pressed)
-    pressed =~ /^(ems_cluster|miq_template|infra_networking)_(.*)$/ ? [$1, $2] : pressed.split('_', 2)
+    pressed =~ /^(ems_cluster|miq_template|infra_networking|automation_manager_provider|configuration_manager_provider)_(.*)$/ ? [$1, $2] : pressed.split('_', 2)
   end
 
   def model_for_ems(record)

app/helpers/application_helper/toolbar/automation_manager_provider_center.rb

@@ -33,6 +33,20 @@ class ApplicationHelper::Toolbar::AutomationManagerProviderCenter < ApplicationH
         )
       ]
     ),
-  ]
-  )
+  ])
+  button_group('automation_manager_policy', [
+    select(
+      :automation_manager_policy_choice,
+      'fa fa-shield fa-lg',
+      t = N_('Policy'),
+      t,
+      :items => [
+        button(
+          :automation_manager_provider_tag,
+          'pficon pficon-edit fa-lg',
+          N_('Edit Tags for this Ansible Tower Providers'),
+          N_('Edit Tags'))
+      ]
+    )
+  ])
 end

app/helpers/application_helper/toolbar/automation_manager_providers_center.rb

@@ -48,9 +48,28 @@ class ApplicationHelper::Toolbar::AutomationManagerProvidersCenter < Application
           :enabled   => false,
           :onwhen    => "1+"
         ),
-        separator,
+      ]
+    )
+  ])
+  button_group('automation_manager_policy', [
+    select(
+      :automation_manager_policy_choice,
+      'fa fa-shield fa-lg',
+      t = N_('Policy'),
+      t,
+      :enabled => false,
+      :onwhen  => "1+",
+      :items   => [
+        button(
+          :automation_manager_provider_tag,
+          'pficon pficon-edit fa-lg',
+          N_('Edit Tags for the selected Ansible Tower Providers'),
+          N_('Edit Tags'),
+          :url_parms => "main_div",
+          :enabled   => false,
+          :klass => ApplicationHelper::Button::ButtonWithoutRbacCheck,
+          :onwhen    => "1+"),
       ]
     ),
-  ]
-  )
+  ])
 end

app/helpers/application_helper/toolbar/configuration_manager_provider_center.rb

@@ -31,4 +31,19 @@ class ApplicationHelper::Toolbar::ConfigurationManagerProviderCenter < Applicati
       ]
     ),
   ])
+  button_group('configuration_manager_policy', [
+    select(
+      :configuration_manager_policy_choice,
+      'fa fa-shield fa-lg',
+      t = N_('Policy'),
+      t,
+      :items => [
+        button(
+          :configuration_manager_provider_tag,
+          'pficon pficon-edit fa-lg',
+          N_('Edit Tags for this Ansible Tower Providers'),
+          N_('Edit Tags'))
+      ]
+    )
+  ])
 end

app/helpers/application_helper/toolbar/configuration_manager_providers_center.rb

@@ -48,4 +48,23 @@ class ApplicationHelper::Toolbar::ConfigurationManagerProvidersCenter < Applicat
       ]
     ),
   ])
+  button_group('configuration_manager_policy', [
+    select(
+      :configuration_manager_policy_choice,
+      'fa fa-shield fa-lg',
+      t = N_('Policy'),
+      t,
+      :enabled => false,
+      :onwhen  => "1+",
+      :items   => [
+        button(
+          :configuration_manager_provider_tag,
+          'pficon pficon-edit fa-lg',
+          N_('Edit Tags for this Foreman Provider'),
+          N_('Edit Tags'),
+          :url_parms => "main_div",
+          :onwhen    => "1+")
+      ]
+    )
+  ])
 end

config/routes.rb

@@ -169,6 +169,7 @@
         form_fields
         show
         x_show
+        x_button
         show_list
         tagging_edit
       ),
@@ -2701,6 +2702,7 @@
         cs_form_field_changed
         users
         wait_for_task
+        x_button
       ) +
                adv_search_post +
                x_post