From 76c139253ef3bbe3963e709d87fc6331d86e1161 Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Fri, 10 Dec 2021 15:24:16 +0100 Subject: [PATCH 1/2] :art: Fix language injection --- .../fieldrenderer/bslinkedsetfieldrenderer.class.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/renderer/bootstrap/fieldrenderer/bslinkedsetfieldrenderer.class.inc.php b/sources/renderer/bootstrap/fieldrenderer/bslinkedsetfieldrenderer.class.inc.php index 5f06e3cbf..7fe426564 100644 --- a/sources/renderer/bootstrap/fieldrenderer/bslinkedsetfieldrenderer.class.inc.php +++ b/sources/renderer/bootstrap/fieldrenderer/bslinkedsetfieldrenderer.class.inc.php @@ -430,7 +430,7 @@ EOF $sAddButtonEndpoint = str_replace('-sMode-', 'from-attribute', $this->oField->GetSearchEndpoint()); // - Output $oOutput->AddJs( - <<oField->GetGlobalId()} = function() @@ -527,7 +527,7 @@ EOF ); oModalElem.modal('show'); }); -EOF +JS ); } } From 219b970703dce6c985117bfd1434a37fd6f08132 Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Fri, 10 Dec 2021 15:39:49 +0100 Subject: [PATCH 2/2] =?UTF-8?q?N=C2=B04478=20Fix=20linkedset=20widget=20in?= =?UTF-8?q?=20portal=20when=20adding=20new=20items=20with=20already=20sele?= =?UTF-8?q?cted=20ones=20Was=20already=20committed=20to=20develop=20with?= =?UTF-8?q?=20e59d472c?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fieldrenderer/bslinkedsetfieldrenderer.class.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sources/renderer/bootstrap/fieldrenderer/bslinkedsetfieldrenderer.class.inc.php b/sources/renderer/bootstrap/fieldrenderer/bslinkedsetfieldrenderer.class.inc.php index 7fe426564..333e86c19 100644 --- a/sources/renderer/bootstrap/fieldrenderer/bslinkedsetfieldrenderer.class.inc.php +++ b/sources/renderer/bootstrap/fieldrenderer/bslinkedsetfieldrenderer.class.inc.php @@ -363,7 +363,7 @@ JS oData.items[i].target_id = oData.items[i].id; // Adding item to table only if it's not already there - if($('#{$sTableId} tr[role="row"] > td input[data-target-object-id="' + oData.items[i].target_id + '"], #{$sTableId} tr[role="row"] > td input[data-target-object-id="' + (oData.items[i].target_id*-1) + '"]').length === 0) + if($('#{$sTableId} tr[id] > td input[data-target-object-id="' + oData.items[i].target_id + '"], #{$sTableId} tr[id] > td input[data-target-object-id="' + (oData.items[i].target_id*-1) + '"]').length === 0) { // Making id negative in order to recognize it when persisting oData.items[i].id = -1 * parseInt(oData.items[i].id); @@ -457,7 +457,7 @@ EOF // Checking removed objects for(var i in oValues.current) { - if($('#{$sTableId} tr[role="row"] input[data-object-id="'+i+'"]').length === 0) + if($('#{$sTableId} tr[id="'+i+'"]').length === 0) { oValues.remove[i] = {}; } @@ -492,7 +492,7 @@ EOF $('#{$sButtonAddId}').off('click').on('click', function(){ // Preparing current values var aObjectIdsToIgnore = []; - $('#{$sTableId} tr[role="row"] > td input[data-target-object-id]').each(function(iIndex, oElem){ + $('#{$sTableId} tr[id] > td input[data-target-object-id]').each(function(iIndex, oElem){ aObjectIdsToIgnore.push( $(oElem).attr('data-target-object-id') ); }); // Creating a new modal