diff --git a/app/helpers/ems_cloud_helper/textual_summary.rb b/app/helpers/ems_cloud_helper/textual_summary.rb index 7314c41f09dc..a0399f0b929c 100644 --- a/app/helpers/ems_cloud_helper/textual_summary.rb +++ b/app/helpers/ems_cloud_helper/textual_summary.rb @@ -146,7 +146,8 @@ def textual_security_groups end def textual_zone - {:label => _("Managed by Zone"), :icon => "pficon pficon-zone", :value => @record.zone.name} + zone = @record.zone.visible? ? @record.zone : @record.backup_zone + {:label => _("Managed by Zone"), :icon => "pficon pficon-zone", :value => zone.name} end def textual_topology diff --git a/app/helpers/ems_container_helper/textual_summary.rb b/app/helpers/ems_container_helper/textual_summary.rb index e62e2a8c0b3a..2ec49bc96331 100644 --- a/app/helpers/ems_container_helper/textual_summary.rb +++ b/app/helpers/ems_container_helper/textual_summary.rb @@ -71,7 +71,8 @@ def textual_port end def textual_zone - {:label => _("Managed by Zone"), :icon => "pficon pficon-zone", :value => @record.zone.name} + zone = @record.zone.visible? ? @record.zone : @record.backup_zone + {:label => _("Managed by Zone"), :icon => "pficon pficon-zone", :value => zone.name} end def textual_topology diff --git a/app/helpers/ems_infra_helper/textual_summary.rb b/app/helpers/ems_infra_helper/textual_summary.rb index fe955f022864..c624d1443192 100644 --- a/app/helpers/ems_infra_helper/textual_summary.rb +++ b/app/helpers/ems_infra_helper/textual_summary.rb @@ -170,7 +170,8 @@ def textual_orchestration_stacks end def textual_zone - {:label => _("Managed by Zone"), :icon => "pficon pficon-zone", :value => @record.zone.name} + zone = @record.zone.visible? ? @record.zone : @record.backup_zone + {:label => _("Managed by Zone"), :icon => "pficon pficon-zone", :value => zone.name} end def textual_host_default_vnc_port_range diff --git a/app/helpers/ems_network_helper/textual_summary.rb b/app/helpers/ems_network_helper/textual_summary.rb index 7cfe309c86d9..6edde518772b 100644 --- a/app/helpers/ems_network_helper/textual_summary.rb +++ b/app/helpers/ems_network_helper/textual_summary.rb @@ -103,7 +103,8 @@ def textual_topology end def textual_zone - {:label => _("Managed by Zone"), :icon => "pficon pficon-zone", :value => @record.zone.try(:name)} + zone = @record.zone.visible? ? @record.zone : @record.backup_zone + {:label => _("Managed by Zone"), :icon => "pficon pficon-zone", :value => zone.name} end def textual_cloud_tenants diff --git a/app/helpers/ems_physical_infra_helper/textual_summary.rb b/app/helpers/ems_physical_infra_helper/textual_summary.rb index 8f8a0ea8b422..cb8f26e8f486 100644 --- a/app/helpers/ems_physical_infra_helper/textual_summary.rb +++ b/app/helpers/ems_physical_infra_helper/textual_summary.rb @@ -106,7 +106,8 @@ def textual_vms end def textual_zone - {:label => _("Managed by Zone"), :icon => "pficon pficon-zone", :value => @record.zone.name} + zone = @record.zone.visible? ? @record.zone : @record.backup_zone + {:label => _("Managed by Zone"), :icon => "pficon pficon-zone", :value => zone.name} end def textual_topology diff --git a/app/helpers/ems_storage_helper/textual_summary.rb b/app/helpers/ems_storage_helper/textual_summary.rb index 3c4d1f14a6e6..181ba51d50c0 100644 --- a/app/helpers/ems_storage_helper/textual_summary.rb +++ b/app/helpers/ems_storage_helper/textual_summary.rb @@ -62,7 +62,8 @@ def textual_parent_ems_cloud end def textual_zone - {:label => _("Managed by Zone"), :icon => "pficon pficon-zone", :value => @record.zone.try(:name)} + zone = @record.zone.visible? ? @record.zone : @record.backup_zone + {:label => _("Managed by Zone"), :icon => "pficon pficon-zone", :value => zone.name} end def textual_cloud_volumes