composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/2.6' into support/2.7

Browse Source 
# Conflicts:
#	sources/renderer/bootstrap/fieldrenderer/bslinkedsetfieldrenderer.class.inc.php
This commit is contained in:
Pierre Goiffon
2021-11-26 11:45:11 +01:00
parent c9c32b0de1 5e48400cb1
commit 7d6b019cfa
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
datamodels/2.x/itop-portal-base/portal/templates/bricks/object/mode_search_regular.html.twig
View File

@@ -122,7 +122,7 @@
"dom": '<"row"<"col-sm-6"l><"col-sm-6"<f><"visible-xs"p>>>t<"row"<"col-sm-6"i><"col-sm-6"p>>',
"columns": getColumnsDefinition(),
"select": {
"style": "{{ (bMultipleSelect) ? 'multi' : 'os' }}"
"style": "{{ (bMultipleSelect) ? 'multi' : 'single' }}"
},
"rowId": "id",
"rowCallback": function(oRow, oData){
@@ -217,7 +217,7 @@
var aData = oTable.rows(indexes).data().toArray();
// Checking input
$('#{{ sTableId }} tr[role="row"].selected td:first-child input').prop('checked', true);
$('#{{ sTableId }} tr[id].selected td:first-child input').prop('checked', true);
// Saving values in temp array
for(var i in aData)
{
@@ -232,7 +232,7 @@
var aData = oTable.rows(indexes).data().toArray();
// Checking input
$('#{{ sTableId }} tr[role="row"]:not(.selected) td:first-child input').prop('checked', false);
$('#{{ sTableId }} tr[id]:not(.selected) td:first-child input').prop('checked', false);
// Saving values in temp array
for(var i in aData)
{

6
sources/renderer/bootstrap/fieldrenderer/bslinkedsetfieldrenderer.class.inc.php
View File

@@ -161,7 +161,7 @@ EOF
"sortable": false,
"title": '{$sSelectionInputGlobalHtml}',
"type": "html",
"data": "",
"data": "id",
"render": function(data, type, row)
{
var oCheckboxElem = $('{$sSelectionInputHtml}');
@@ -269,7 +269,7 @@ EOF
var aData = oTable_{$this->oField->GetGlobalId()}.rows(indexes).data().toArray();
// Checking input
$('#{$sTableId} tbody tr[role="row"].selected td:first-child input').prop('checked', true);
$('#{$sTableId} tbody tr[id].selected td:first-child input').prop('checked', true);
// Saving values in temp array
for(var i in aData)
{
@@ -287,7 +287,7 @@ EOF
var aData = oTable_{$this->oField->GetGlobalId()}.rows(indexes).data().toArray();
// Checking input
$('#{$sTableId} tbody tr[role="row"]:not(.selected) td:first-child input').prop('checked', false);
$('#{$sTableId} tbody tr[id]:not(.selected) td:first-child input').prop('checked', false);
// Saving values in temp array
for(var i in aData)
{