From b0f0e2b853a549ebd7e6c41c0e8967781b1bd7df Mon Sep 17 00:00:00 2001 From: Martin Hradil Date: Thu, 28 Mar 2019 14:04:49 +0000 Subject: [PATCH] Merge pull request #5384 from skateman/notify-child-services Fix the access to child services from parents under My Services (cherry picked from commit 643b1da108a297b5147c65df5062eafd67af8367) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1693749 --- app/assets/javascripts/miq_tree.js | 5 +++++ app/views/service/_svcs_show.html.haml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/miq_tree.js b/app/assets/javascripts/miq_tree.js index f162b5910ce..2b38fcb702c 100644 --- a/app/assets/javascripts/miq_tree.js +++ b/app/assets/javascripts/miq_tree.js @@ -83,6 +83,11 @@ function miqOnClickSelectTreeNode(id) { miqJqueryRequest(url, {beforeSend: true}); } +function miqTreeSelect(key) { + var url = '/' + ManageIQ.controller + '/tree_select/?id=' + encodeURIComponent(key.split('__')[0]); + miqJqueryRequest(url, {beforeSend: true}); +} + // Activate and focus on a node within a tree given the node's key function miqTreeActivateNode(tree, key) { miqSparkle(true); diff --git a/app/views/service/_svcs_show.html.haml b/app/views/service/_svcs_show.html.haml index c8baf87cdd0..c514c09fbd3 100644 --- a/app/views/service/_svcs_show.html.haml +++ b/app/views/service/_svcs_show.html.haml @@ -27,7 +27,7 @@ %table.table.table-striped.table-bordered.table-hover %tbody - child_services.sort_by { |o| o.name.downcase }.each do |s| - %tr{:onclick => "miqTreeActivateNode('svcs_tree', 's-#{s.id}');", :title => _("View this Service")} + %tr{:onclick => "miqTreeSelect('s-#{s.id}');", :title => _("View this Service")} %td.table-view-pf-select %i.pficon.pficon-service %td