Merge branch 'bug_22428/missing_tooltip_on_unused_directives_icon_pr'…

… into branches/rudder/7.2
Normation · Mar 17, 2023 · 7a26a92 · 7a26a92
2 parents 14b7281 + d74a2c7
commit 7a26a92
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...er/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayDirectiveTree.scala b/...er/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayDirectiveTree.scala
@@ -470,7 +470,7 @@ object DisplayDirectiveTree extends Loggable {
           """
 
           <span id={"badge-apm-" + tooltipId}>[BADGE]</span> ++
-          <span class="treeDirective bsTooltip" data-toggle="tooltip" data-placement="top" data-html="true" title={
+          <span class="treeDirective bsTooltip" data-toggle="tooltip" data-placement="top" data-html="true" data-container="body" title={
             tooltipContent
           }>
             <span class="techversion">

diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/javascript/rudder/tree.js b/webapp/sources/rudder/rudder-web/src/main/webapp/javascript/rudder/tree.js
@@ -420,7 +420,7 @@ var buildDirectiveTree = function(id, initially_select, appContext, select_limit
 
     openTreeNodes(id, "directiveTreeSettings_nodesState", data);
 
-    $(id+' .rudder-label').bsTooltip();
+    $(id+' .rudder-label, .bsTooltip').bsTooltip();
     }).on("ready.jstree", function () {
       // make jstree node openable in a new tab
       var nodes = document.querySelectorAll('[id^="jsTree-"][id$="_anchor"]');