Fixes missing toolbar button for tagging from a configured system sum…

…mary page in the ansible provider accordion Fixed mixed lifecycle toolbars for foreman and automation
ManageIQ · Nov 21, 2017 · 8e85612 · 8e85612
1 parent ccf89fc
commit 8e85612
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 11 deletions.
diff --git a/app/controllers/automation_manager_controller.rb b/app/controllers/automation_manager_controller.rb
@@ -105,7 +105,7 @@ def class_for_provider_node
     case nodes.first
     when "root" then ManageIQ::Providers::AnsibleTower::AutomationManager
     when "at", "e" then ManageIQ::Providers::AutomationManager::InventoryRootGroup
-    when "f"    then ManageIQ::Providers::AnsibleTower::AutomationManager::ConfiguredSystem
+    when "f", "cs"    then ManageIQ::Providers::AnsibleTower::AutomationManager::ConfiguredSystem
     when "xx" then
       case nodes.second
       when "at"  then ManageIQ::Providers::AnsibleTower::AutomationManager

diff --git a/...figured_system/automation_policy_mixin.rb → ...figured_system/automation/policy_mixin.rb b/...figured_system/automation_policy_mixin.rb → ...figured_system/automation/policy_mixin.rb
@@ -1,4 +1,4 @@
-module ApplicationHelper::Toolbar::ConfiguredSystem::AutomationPolicyMixin
+module ApplicationHelper::Toolbar::ConfiguredSystem::Automation::PolicyMixin
   def self.included(included_class)
     included_class.button_group('automation_manager_policy', [
        included_class.select(

diff --git a/...lbar/configured_system/lifecycle_mixin.rb → ...figured_system/foreman/lifecycle_mixin.rb b/...lbar/configured_system/lifecycle_mixin.rb → ...figured_system/foreman/lifecycle_mixin.rb
@@ -1,4 +1,4 @@
-module ApplicationHelper::Toolbar::ConfiguredSystem::LifecycleMixin
+module ApplicationHelper::Toolbar::ConfiguredSystem::Foreman::LifecycleMixin
   def self.included(included_class)
     included_class.button_group('provider_foreman_lifecycle', [
       included_class.select(

diff --git a/...toolbar/configured_system/policy_mixin.rb → ...configured_system/foreman/policy_mixin.rb b/...toolbar/configured_system/policy_mixin.rb → ...configured_system/foreman/policy_mixin.rb
@@ -1,4 +1,4 @@
-module ApplicationHelper::Toolbar::ConfiguredSystem::PolicyMixin
+module ApplicationHelper::Toolbar::ConfiguredSystem::Foreman::PolicyMixin
   def self.included(included_class)
     included_class.button_group('provider_foreman_policy', [
       included_class.select(

diff --git a/app/helpers/application_helper/toolbar/configured_systems_ansible_center.rb b/app/helpers/application_helper/toolbar/configured_systems_ansible_center.rb
@@ -1,3 +1,3 @@
 class ApplicationHelper::Toolbar::ConfiguredSystemsAnsibleCenter < ApplicationHelper::Toolbar::Basic
-  include ApplicationHelper::Toolbar::ConfiguredSystem::PolicyMixin
+  include ApplicationHelper::Toolbar::ConfiguredSystem::Automation::PolicyMixin
 end
diff --git a/app/helpers/application_helper/toolbar/configured_systems_center.rb b/app/helpers/application_helper/toolbar/configured_systems_center.rb
@@ -1,4 +1,4 @@
 class ApplicationHelper::Toolbar::ConfiguredSystemsCenter < ApplicationHelper::Toolbar::Basic
-  include ApplicationHelper::Toolbar::ConfiguredSystem::LifecycleMixin
-  include ApplicationHelper::Toolbar::ConfiguredSystem::PolicyMixin
+  include ApplicationHelper::Toolbar::ConfiguredSystem::Foreman::LifecycleMixin
+  include ApplicationHelper::Toolbar::ConfiguredSystem::Foreman::PolicyMixin
 end
diff --git a/app/helpers/application_helper/toolbar/unassigned_profiles_group_center.rb b/app/helpers/application_helper/toolbar/unassigned_profiles_group_center.rb
@@ -1,4 +1,4 @@
 class ApplicationHelper::Toolbar::UnassignedProfilesGroupCenter < ApplicationHelper::Toolbar::Basic
-  include ApplicationHelper::Toolbar::ConfiguredSystem::LifecycleMixin
-  include ApplicationHelper::Toolbar::ConfiguredSystem::PolicyMixin
+  include ApplicationHelper::Toolbar::ConfiguredSystem::Foreman::LifecycleMixin
+  include ApplicationHelper::Toolbar::ConfiguredSystem::Foreman::PolicyMixin
 end
diff --git a/...application_helper/toolbar/x_automation_manager_ansible_tower_configured_system_center.rb b/...application_helper/toolbar/x_automation_manager_ansible_tower_configured_system_center.rb
@@ -1,3 +1,22 @@
 class ApplicationHelper::Toolbar::XAutomationManagerAnsibleTowerConfiguredSystemCenter < ApplicationHelper::Toolbar::Basic
-  include ApplicationHelper::Toolbar::ConfiguredSystem::AutomationPolicyMixin
+  button_group('record_summary', [
+    select(
+      :automation_manager_policy_choice,
+      'fa fa-shield fa-lg',
+      t = N_('Policy'),
+      t,
+      :enabled => true,
+      :items   => [
+        button(
+          :configured_system_tag,
+          'pficon pficon-edit fa-lg',
+          N_('Edit Tags for this Configured System'),
+          N_('Edit Tags'),
+          :url          => "tagging",
+          :url_parms    => "main_div",
+          :send_checked => true,
+          :enabled      => true),
+      ]
+    ),
+  ])
 end
diff --git a/app/helpers/application_helper/toolbar_chooser.rb b/app/helpers/application_helper/toolbar_chooser.rb
@@ -598,7 +598,7 @@ def configuration_manager_providers_tree_center_tb(nodes)
     when "f"        then  inventory_group_center_tb
     when "xx"       then
       case nodes.last
-      when "f"  then "configured_systems_ansible_center_tb"
+      when "f"  then "configured_systems_center_tb"
       when "cp" then "unassigned_profiles_group_center_tb"
       else "configuration_manager_providers_center_tb"
       end