From 8e65260137352335d971c6da230cbfbbea0636d5 Mon Sep 17 00:00:00 2001 From: Libor Pichler Date: Mon, 26 Oct 2015 17:34:02 +0100 Subject: [PATCH] Fix cloud provider link in timeline bubble https://bugzilla.redhat.com/show_bug.cgi?id=1273182 --- lib/report_formatter/timeline.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/report_formatter/timeline.rb b/lib/report_formatter/timeline.rb index 0135910b5eb..e329c638755 100644 --- a/lib/report_formatter/timeline.rb +++ b/lib/report_formatter/timeline.rb @@ -100,7 +100,7 @@ def tl_event(tl_xml, row, col) e_icon = "/images/icons/timeline/vendor-#{rec.vmm_vendor.downcase}.png" e_image = "/images/icons/new/os-#{rec.os_image_name.downcase}.png" e_text = "<a href='/host/show/#{rec.id}'>#{e_title}</a>" - when "EmsEvent" + when "EventStream" ems_cloud = false if rec[:ems_id] && ExtManagementSystem.exists?(rec[:ems_id]) ems = ExtManagementSystem.find(rec[:ems_id]) @@ -245,7 +245,13 @@ def tl_event(tl_xml, row, col) elsif co == "ems_cluster_name" && !rec.ems_cluster_id.nil? e_text += "<a href='/ems_cluster/show/#{to_cid(rec.ems_cluster_id)}'>#{row[co]}</a>" elsif co == "ext_management_system.name" && rec.ext_management_system && !rec.ext_management_system.id.nil? - e_text += "<a href='/#{ems_cloud ? "ems_cloud" : "ems_infra"}/show/#{to_cid(rec.ext_management_system.id)}'>#{row[co]}</a>" + provider_id = rec.ext_management_system.id + if ems_cloud + # restful route is used for cloud provider unlike infrastructure provider + e_text += "<a href='/ems_cloud/#{provider_id}'>#{row[co]}</a>" + else + e_text += "<a href='/ems_infra/show/#{to_cid(provider_id)}'>#{row[co]}</a>" + end elsif co == "availability_zone.name" && !rec.availability_zone_id.nil? e_text += "<a href='/availability_zone/show/#{to_cid(rec.availability_zone_id)}'>#{row[co]}</a>" elsif mri.db == "BottleneckEvent" && co == "resource_name"