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

ManageIQ · Jun 1, 2018 · 5730840 · 5730840
1 parent ec8a786
commit 5730840
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 8 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.status_icon(authentication_status))
+      }.merge(QuadiconHelper.status_icon(authentication_status, enabled?))
     }
     icon[:middle] = { :fileicon => '100/shield.png' } if get_policies.present?
     icon

diff --git a/app/decorators/host_decorator.rb b/app/decorators/host_decorator.rb
@@ -17,7 +17,7 @@ def quadicon
       },
       :bottom_right => {
         :tooltip  => authentication_status
-      }.merge(QuadiconHelper.status_icon(authentication_status))
+      }.merge(QuadiconHelper.status_icon(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.status_icon(authentication_status)),
+      }.merge(QuadiconHelper.status_icon(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.status_icon(authentication_status)),
+      }.merge(QuadiconHelper.status_icon(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.status_icon(authentication_status))
+      }.merge(QuadiconHelper.status_icon(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.status_icon(authentication_status))
+      }.merge(QuadiconHelper.status_icon(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.status_icon(authentication_status))
+      }.merge(QuadiconHelper.status_icon(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
@@ -29,7 +29,10 @@ module QuadiconHelper
     'template'                  => {:fonticon => 'pficon pficon-template', :background => '#336699'},
   }.freeze
 
-  def self.status_icon(status)
+  def self.status_icon(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'}