UI changes needed for embedded ansible models

ManageIQ · Mar 6, 2017 · 730c1f3 · 730c1f3
1 parent 03f4f3c
commit 730c1f3
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 15 deletions.
diff --git a/app/controllers/ansible_credential_controller.rb b/app/controllers/ansible_credential_controller.rb
@@ -16,7 +16,7 @@ def self.display_methods
   end
 
   def self.model
-    ManageIQ::Providers::AutomationManager::Authentication
+    ManageIQ::Providers::EmbeddedAutomationManager::Authentication
   end
 
   def display_repositories

diff --git a/app/controllers/ansible_playbook_controller.rb b/app/controllers/ansible_playbook_controller.rb
@@ -12,7 +12,7 @@ class AnsiblePlaybookController < ApplicationController
   menu_section :ansible
 
   def self.model
-    ManageIQ::Providers::AnsibleTower::AutomationManager::Playbook
+    ManageIQ::Providers::EmbeddedAnsible::AutomationManager::Playbook
   end
 
   private

diff --git a/app/controllers/ansible_repository_controller.rb b/app/controllers/ansible_repository_controller.rb
@@ -16,11 +16,11 @@ def self.display_methods
   end
 
   def self.model
-    ConfigurationScriptSource
+    ManageIQ::Providers::EmbeddedAutomationManager::ConfigurationScriptSource
   end
 
   def display_playbooks
-    nested_list("ansible_playbook", ManageIQ::Providers::AnsibleTower::AutomationManager::Playbook)
+    nested_list("ansible_playbook", ManageIQ::Providers::EmbeddedAnsible::AutomationManager::Playbook)
   end
 
   private

diff --git a/app/decorators/manageiq/providers/embedded_ansible/automation_manager/playbook_decorator.rb b/app/decorators/manageiq/providers/embedded_ansible/automation_manager/playbook_decorator.rb
@@ -0,0 +1,11 @@
+module ManageIQ::Providers::EmbeddedAnsible
+  class AutomationManager::PlaybookDecorator < MiqDecorator
+    def fonticon
+      nil
+    end
+
+    def listicon_image
+      'svg/vendor-ansible.svg'
+    end
+  end
+end
diff --git a/app/decorators/manageiq/providers/embedded_automation_manager/authentication_decorator.rb b/app/decorators/manageiq/providers/embedded_automation_manager/authentication_decorator.rb
@@ -0,0 +1,11 @@
+module ManageIQ::Providers
+  class EmbeddedAutomationManager::AuthenticationDecorator < MiqDecorator
+    def fonticon
+      'fa fa-lock'
+    end
+
+    def listicon_image
+      '100/authentication.png'
+    end
+  end
+end
diff --git a/...s/manageiq/providers/embedded_automation_manager/configuration_script_source_decorator.rb b/...s/manageiq/providers/embedded_automation_manager/configuration_script_source_decorator.rb
@@ -0,0 +1,11 @@
+module ManageIQ::Providers
+  class EmbeddedAutomationManager::ConfigurationScriptSourceDecorator < MiqDecorator
+    def fonticon
+      "pficon pficon-repository"
+    end
+
+    def listicon_image
+      nil
+    end
+  end
+end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -192,10 +192,12 @@ def url_for_record(record, action = "show") # Default action is show
             controller_for_vm(model_for_vm(record))
           elsif record.class.respond_to?(:db_name)
             record.class.db_name
-          elsif record.kind_of?(ManageIQ::Providers::AnsibleTower::AutomationManager::Playbook)
+          elsif record.kind_of?(ManageIQ::Providers::EmbeddedAnsible::AutomationManager::Playbook)
             "ansible_playbook"
-          elsif record.kind_of?(ManageIQ::Providers::AnsibleTower::AutomationManager::Authentication)
+          elsif record.kind_of?(ManageIQ::Providers::EmbeddedAutomationManager::Authentication)
             "ansible_credential"
+          elsif record.kind_of?(ManageIQ::Providers::EmbeddedAutomationManager::ConfigurationScriptSource)
+            "ansible_repository"
           else
             record.class.base_class.to_s
           end
@@ -317,7 +319,7 @@ def db_to_controller(db, action = "show")
       action = "show"
     when "ConditionSet"
       controller = "condition"
-    when "ConfigurationScriptSource"
+    when "ManageIQ::Providers::EmbeddedAutomationManager::ConfigurationScriptSource"
       controller = "ansible_repository"
     when "ScanItemSet"
       controller = "ops"
@@ -353,9 +355,9 @@ def db_to_controller(db, action = "show")
       action = "show"
     when "ServiceResource", "ServiceTemplate"
       controller = "catalog"
-    when "ManageIQ::Providers::AnsibleTower::AutomationManager::Playbook"
+    when "ManageIQ::Providers::EmbeddedAnsible::AutomationManager::Playbook"
       controller = "ansible_playbook"
-    when "ManageIQ::Providers::AutomationManager::Authentication"
+    when "ManageIQ::Providers::EmbeddedAutomationManager::Authentication"
       controller = "ansible_credential"
     when "MiqWorker"
       controller = request.parameters[:controller]
@@ -1181,8 +1183,8 @@ def pdf_page_size_style
                         host
                         host_aggregate
                         load_balancer
-                        manageiq/providers/ansible_tower/automation_manager/playbook
-                        manageiq/providers/automation_manager/authentication
+                        manageiq/providers/embedded_ansible/automation_manager/playbook
+                        manageiq/providers/embedded_automation_manager/authentication
                         middleware_datasource
                         middleware_deployment
                         middleware_domain

diff --git a/app/helpers/application_helper/title.rb b/app/helpers/application_helper/title.rb
@@ -76,9 +76,9 @@ def title_from_layout(layout)
                 _(": Requests")
               when "manageiq/providers/ansible_tower/automation_manager/playbook"
                 _(": Playbooks (Ansible Tower)")
-              when "manageiq/providers/automation_manager/authentication"
+              when "manageiq/providers/embedded_automation_manager/authentication"
                 _(": Credentials")
-              when "configuration_script_source"
+              when "manageiq/providers/embedded_automation_manager/configuration_script_source"
                 _(": Repositories")
 
               else

diff --git a/app/helpers/quadicon_helper.rb b/app/helpers/quadicon_helper.rb
@@ -291,9 +291,11 @@ def quadicon_model_name(item)
     if item.class.respond_to?(:db_name)
       item.class.db_name
     # FIXME: quadicon_model_name() and url_for_record() need to be unified, since both do basically the same thing
-    elsif item.kind_of?(ManageIQ::Providers::AnsibleTower::AutomationManager::Playbook)
+    elsif item.kind_of?(ManageIQ::Providers::EmbeddedAnsible::AutomationManager::Playbook)
       'ansible_playbook'
-    elsif item.kind_of?(ManageIQ::Providers::AutomationManager::Authentication)
+    elsif item.kind_of?(ManageIQ::Providers::EmbeddedAutomationManager::ConfigurationScriptSource)
+      'ansible_repository'
+    elsif item.kind_of?(ManageIQ::Providers::EmbeddedAutomationManager::Authentication)
       'ansible_credential'
     else
       item.class.base_model.name