composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-20 17:18:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°4662 - Portal: Fix broken display of the services catalogue when installing Service Provider + Sample Data

Browse Source 
(cherry picked from commit f9e8bf88c8)
This commit is contained in:
acognet
2022-02-15 09:50:44 +01:00
parent e971d628dd
commit ec75195a2f
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_list.html.twig
View File

@@ -79,7 +79,8 @@
// Building tooltip for the node
// We have to concatenate the HTML as we return the raw HTML of the cell. If we did a jQuery.insertAfter, the tooltip would not be returned.
// For the same reason, tooltip widget is created in "drawCallback" instead of here.
if( (data.tooltip !== undefined) && ($(data.tooltip).text() !== ''))
// N°4662 - Surround tooltip with div to ensure text retrival
if( (data.tooltip !== undefined) && ($('<div>'+data.tooltip+'</div>').text() !== ''))
{
cellElem.html( $('<span></span>').attr('data-tooltip-content', data.tooltip).attr('data-tooltip-html-enabled', true).html(data.name).prop('outerHTML') );
}

2
datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_mosaic.html.twig
View File

@@ -215,7 +215,7 @@
itemElem.append(aElem);
// Building tooltip for the node
if( (item.tooltip !== undefined) && ($(item.tooltip).text() !== '') )
if( (item.tooltip !== undefined) && ($('<div>'+item.tooltip+'</div>').text() !== '') )
{
aElem.attr('data-tooltip-content', item.tooltip).attr('data-tooltip-html-enabled', true);
CombodoTooltip.InitTooltipFromMarkup(aElem);

2
datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_tree.html.twig
View File

@@ -204,7 +204,7 @@
liElem.append(aElem);
// Building tooltip for the node
if( (item.tooltip !== undefined) && ($(item.tooltip).text() !== '') )
if( (item.tooltip !== undefined) && ($('<div>'+item.tooltip+'</div>').text() !== '') )
{
nameElem.attr('data-tooltip-content', item.tooltip).attr('data-tooltip-html-enabled', true);
CombodoTooltip.InitTooltipFromMarkup(nameElem);