From 104f44e568e575331d087a175f592af62e89ec3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1vid=20Hal=C3=A1sz?= Date: Fri, 1 Jun 2018 16:20:19 +0200 Subject: [PATCH] Display pficon-asleep icon in bottom-right quad for disabled providers --- app/decorators/ext_management_system_decorator.rb | 2 +- app/decorators/manageiq/providers/cloud_manager_decorator.rb | 2 +- .../manageiq/providers/container_manager_decorator.rb | 2 +- app/decorators/manageiq/providers/infra_manager_decorator.rb | 2 +- app/decorators/manageiq/providers/network_manager_decorator.rb | 2 +- .../manageiq/providers/physical_infra_manager_decorator.rb | 2 +- app/helpers/quadicon_helper.rb | 3 +++ 7 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/decorators/ext_management_system_decorator.rb b/app/decorators/ext_management_system_decorator.rb index 6b38a150a9a..1a56f755f0c 100644 --- 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 index 682026efec4..3488308e08c 100644 --- 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 index 1737cbccd44..1e54e1edd2a 100644 --- 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 index 52bb28215f6..e7df18f260a 100644 --- 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 index 65850500379..4eab3a1fc35 100644 --- 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 index 96b72b0b22b..f5bcdc3b483 100644 --- 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 index 38a579d3130..22160af157c 100644 --- 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'}