Display pficon-asleep icon in bottom-right quad for disabled providers

ManageIQ · Jun 1, 2018 · 104f44e · 104f44e
1 parent 5ca19a1
commit 104f44e
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 6 deletions.
diff --git a/app/decorators/ext_management_system_decorator.rb b/app/decorators/ext_management_system_decorator.rb
@@ -21,7 +21,7 @@ def quadicon
       },
       :bottom_right => {
         :tooltip  => authentication_status
-      }.merge(QuadiconHelper.provider_status(authentication_status))
+      }.merge(QuadiconHelper.provider_status(authentication_status, enabled?))
     }
     icon[:middle] = { :fileicon => '100/shield.png' } if get_policies.present?
     icon

diff --git a/app/decorators/manageiq/providers/cloud_manager_decorator.rb b/app/decorators/manageiq/providers/cloud_manager_decorator.rb
@@ -21,7 +21,7 @@ def quadicon
       },
       :bottom_right => {
         :tooltip  => authentication_status
-      }.merge(QuadiconHelper.provider_status(authentication_status))
+      }.merge(QuadiconHelper.provider_status(authentication_status, enabled?))
     }
     icon[:middle] = { :fileicon => '100/shield.png' } if get_policies.present?
     icon

diff --git a/app/decorators/manageiq/providers/container_manager_decorator.rb b/app/decorators/manageiq/providers/container_manager_decorator.rb
@@ -21,7 +21,7 @@ def quadicon
       },
       :bottom_right => {
         :tooltip  => authentication_status
-      }.merge(QuadiconHelper.provider_status(authentication_status))
+      }.merge(QuadiconHelper.provider_status(authentication_status, enabled?))
     }
     icon[:middle] = { :fileicon => '100/shield.png' } if get_policies.present?
     icon

diff --git a/app/decorators/manageiq/providers/infra_manager_decorator.rb b/app/decorators/manageiq/providers/infra_manager_decorator.rb
@@ -21,7 +21,7 @@ def quadicon
       },
       :bottom_right => {
         :tooltip  => authentication_status
-      }.merge(QuadiconHelper.provider_status(authentication_status))
+      }.merge(QuadiconHelper.provider_status(authentication_status, enabled?))
     }
     icon[:middle] = { :fileicon => '100/shield.png' } if get_policies.present?
     icon

diff --git a/app/decorators/manageiq/providers/network_manager_decorator.rb b/app/decorators/manageiq/providers/network_manager_decorator.rb
@@ -27,7 +27,7 @@ def quadicon
       },
       :bottom_right => {
         :tooltip  => authentication_status
-      }.merge(QuadiconHelper.provider_status(authentication_status))
+      }.merge(QuadiconHelper.provider_status(authentication_status, enabled?))
     }
     icon[:middle] = { :fileicon => '100/shield.png' } if get_policies.present?
     icon

diff --git a/app/decorators/manageiq/providers/physical_infra_manager_decorator.rb b/app/decorators/manageiq/providers/physical_infra_manager_decorator.rb
@@ -21,7 +21,7 @@ def quadicon
       },
       :bottom_right => {
         :tooltip  => authentication_status
-      }.merge(QuadiconHelper.provider_status(authentication_status))
+      }.merge(QuadiconHelper.provider_status(authentication_status, enabled?))
     }
     icon[:middle] = { :fileicon => '100/shield.png' } if get_policies.present?
     icon

diff --git a/app/helpers/quadicon_helper.rb b/app/helpers/quadicon_helper.rb
@@ -30,6 +30,9 @@ module QuadiconHelper
   }.freeze
 
   def self.provider_status(status, enabled = true)
+    # If the provider is suspended, we don't care about the status itself
+    return { :fonticon => 'pficon pficon-asleep' } unless enabled
+
     case status
     when "Invalid"
       {:fileicon => '100/x.png'}