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

# Conflicts:
#	sources/renderer/bootstrap/fieldrenderer/bslinkedsetfieldrenderer.class.inc.php
This commit is contained in:
Pierre Goiffon
2021-11-26 11:45:11 +01:00
2 changed files with 6 additions and 6 deletions

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)
{