");
$aListParams['currentId'] = "$iSearchFormId";
}
// Check if the current class has some sub-classes
@@ -109,7 +117,7 @@ class SearchForm
if (!isset($aExtraParams['result_list_outer_selector']))
{
- if (isset($aExtraParams['table_id']))
+ if (isset($aExtraParams['table_id']) )
{
$aExtraParams['result_list_outer_selector'] = $aExtraParams['table_id'];
}
@@ -168,23 +176,42 @@ class SearchForm
}
}
}
+ $bShowObsoleteData = \appUserPreferences::GetPref('show_obsolete_data', MetaModel::GetConfig()->Get('obsolescence.show_obsolete_data'));// ? What to do when true == utils::IsArchiveMode()
+
$sAction = (isset($aExtraParams['action'])) ? $aExtraParams['action'] : utils::GetAbsoluteUrlAppRoot().'pages/UI.php';
- $sStyle = ($bOpen == 'true') ? '' : 'closed';
+ $sStyle = "ibo-search-form";
+ $sStyle .= ($bOpen == 'true') ? '' : ' closed';
$sStyle .= ($bAutoSubmit === true) ? '' : ' no_auto_submit';
- $sHtml .= "
\n";
+ $oUiSearchBlock->AddToolbarBlock(new Html($sHtml));
+
+
+
+ $oFormSearch=new Form("fs_".$sSearchFormId);
+ $oFormSearch->SetAction($sAction)
+ ->AddCSSClasses($sStyle);
+ $oUiSearchBlock->AddSubBlock($oFormSearch);
+ $oFormSearch->AddSubBlock(InputFactory::MakeForHidden("class", $sClassName));
+ $oFormSearch->AddHtml( "
");//class sf_message header_message
+
+ $oCriterionBlock = new UIContentBlock("fs_{$sSearchFormId}_criterion_outer","sf_criterion_area ibo-criterion-area");
+ $oFormSearch->AddSubBlock($oCriterionBlock);
if (isset($aExtraParams['query_params']))
{
@@ -256,8 +283,6 @@ class SearchForm
$sDateFormat = substr($sDateTimeFormat, 0, $iDateTimeSeparatorPos);
$sTimeFormat = substr($sDateTimeFormat, $iDateTimeSeparatorPos + 1);
- $bShowObsoleteData = \appUserPreferences::GetPref('show_obsolete_data', MetaModel::GetConfig()->Get('obsolescence.show_obsolete_data'));// ? What to do when true == utils::IsArchiveMode()
-
$aSearchParams = array(
'criterion_outer_selector' => "#fs_{$sSearchFormId}_criterion_outer",
'result_list_outer_selector' => "#{$aExtraParams['result_list_outer_selector']}",
@@ -289,9 +314,8 @@ class SearchForm
$oPage->add_ready_script('$("#fs_'.$sSearchFormId.'").search_form_handler('.json_encode($aSearchParams).');');
- return $sHtml;
+ return $oUiBlock;
}
-
/**
* @param \DBObjectSet $oSet
*
diff --git a/synchro/synchro_import.php b/synchro/synchro_import.php
index d15b7be3e..613622414 100644
--- a/synchro/synchro_import.php
+++ b/synchro/synchro_import.php
@@ -491,7 +491,7 @@ try
$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
$oMutex = new iTopMutex('synchro_import_'.$oDataSource->GetKey());
$oMutex->Lock();
- set_time_limit($iLoopTimeLimit);
+ set_time_limit(intval($iLoopTimeLimit));
foreach ($aData as $iRow => $aRow)
{
$sReconciliationCondition = '`primary_key` = '.CMDBSource::Quote($aRow[$iPrimaryKeyCol]);
@@ -633,7 +633,7 @@ try
}
}
$oMutex->Unlock();
- set_time_limit($iPreviousTimeLimit);
+ set_time_limit(intval($iPreviousTimeLimit));
if (($sOutput === 'summary') || ($sOutput === 'details'))
{
diff --git a/synchro/synchrodatasource.class.inc.php b/synchro/synchrodatasource.class.inc.php
index eac1c4048..3c4678492 100644
--- a/synchro/synchrodatasource.class.inc.php
+++ b/synchro/synchrodatasource.class.inc.php
@@ -3466,7 +3466,7 @@ class SynchroExecution
/** @var SynchroReplica $oReplica */
while($oReplica = $oSetToProcess->Fetch())
{
- set_time_limit($iLoopTimeLimit);
+ set_time_limit(intval($iLoopTimeLimit));
$iLastReplicaProcessed = $oReplica->GetKey();
switch ($sDeletePolicy)
{
@@ -3595,7 +3595,7 @@ class SynchroExecution
/** @var \SynchroReplica $oReplica */
while ($oReplica = $oSetToProcess->Fetch())
{
- set_time_limit($iLoopTimeLimit);
+ set_time_limit(intval($iLoopTimeLimit));
$iLastReplicaProcessed = $oReplica->GetKey();
$this->m_oStatLog->AddTrace("Synchronizing replica id=$iLastReplicaProcessed.");
$oReplica->Synchro($this->m_oDataSource, $this->m_aReconciliationKeys, $this->m_aAttributes, $this->m_oChange,
@@ -3697,7 +3697,7 @@ class SynchroExecution
/** @var SynchroReplica $oReplica */
while($oReplica = $oSetToProcess->Fetch())
{
- set_time_limit($iLoopTimeLimit);
+ set_time_limit(intval($iLoopTimeLimit));
$iLastReplicaProcessed = $oReplica->GetKey();
$this->m_oStatLog->AddTrace('Destination object to be DELETED', $oReplica);
$oReplica->DeleteDestObject($this->m_oChange, $this->m_oStatLog);
diff --git a/templates/components/datatable/layout.html.twig b/templates/components/datatable/layout.html.twig
new file mode 100644
index 000000000..b45e9a70b
--- /dev/null
+++ b/templates/components/datatable/layout.html.twig
@@ -0,0 +1,61 @@
+{% for oSubBlock in oUIBlock.GetSubBlocks() %}{{ render_block(oSubBlock, {aPage: aPage}) }}{% endfor %}
+{% if oUIBlock.GetOptions()["select_mode"] is defined %}
+
+
+
+{% endif %}
+
+
+
+ {% if oUIBlock.GetOptions()["select_mode"] is defined %}
+
+
+
+
\ No newline at end of file
diff --git a/templates/components/datatable/layout.js.twig b/templates/components/datatable/layout.js.twig
new file mode 100644
index 000000000..3fa99d332
--- /dev/null
+++ b/templates/components/datatable/layout.js.twig
@@ -0,0 +1,257 @@
+function checkAllDataTable(table, value) {
+ // Set the 'selectionMode' for the future objects to load
+ var selectionMode = 'positive';
+ if (value) {
+ selectionMode = 'negative';
+ }
+
+ // Mark all the displayed items as check or unchecked depending on the value
+ $(table).find(':checkbox[name^=selectObj]:not([disabled])').each(function () {
+ var $currentCheckbox = $(this);
+ $currentCheckbox.prop('checked', value);
+ $currentLine = $currentCheckbox.closest("tr");
+ (value) ? $currentLine.addClass("selected") : $currentLine.removeClass("selected");
+ });
+
+ $(table).parent().parent().find(':input[name=selectionMode]').val(selectionMode);
+ // Reset the list of saved selection...
+ $(':input[name^=storedSelection]').remove();
+ $(table).parent().find(':checkbox[name^=selectObj]').trigger("change");
+
+ if (value) {
+ $(table).DataTable().rows().select();
+ } else {
+ $(table).DataTable().rows({page: 'current'}).deselect();
+ }
+
+ return true;
+}
+
+$('#{{ oUIBlock.GetId() }}').closest("[role=dialog]").on("dialogbeforeclose", function () {
+ $('#{{ oUIBlock.GetId() }}').DataTable().clear();
+});
+
+{% if oUIBlock.GetOption("select_mode") is defined %}
+var oSelectedItems{{ oUIBlock.GetOption('sTableId') }} = [];
+{% endif %}
+
+if ($.fn.dataTable.isDataTable('#{{ oUIBlock.GetId() }}')) {
+ $('#{{ oUIBlock.GetId() }}').DataTable().destroy(false);
+}
+
+var oTable{{ oUIBlock.GetId() }} = $('#{{ oUIBlock.GetId() }}').DataTable({
+ "language": {
+ "processing": "{{ 'UI:Datatables:Language:Processing'|dict_s }}",
+ "search": "{{ 'UI:Datatables:Language:Search'|dict_s }}",
+ "lengthMenu": "{{ 'UI:Datatables:Language:LengthMenu'|dict_s }}",
+ "zeroRecords": "{{ 'UI:Datatables:Language:ZeroRecords'|dict_s }}",
+ "info": "{{ 'UI:Datatables:Language:Info'|dict_s }}",
+ "infoEmpty": "{{ 'UI:Datatables:Language:InfoEmpty'|dict_s }}",
+ "infoFiltered": "({{ 'UI:Datatables:Language:InfoFiltered'|dict_s }})",
+ "emptyTable": "{{ 'UI:Datatables:Language:EmptyTable'|dict_s }}",
+ "paginate": {
+ "first": "<<",
+ previous: "
",
+ next: "
",
+ "last": ">>"
+ },
+ "aria": {
+ "sortAscending": ": {{ 'UI:Datatables:Language:Sort:Ascending'|dict_s }}",
+ "sortDescending": ": {{ 'UI:Datatables:Language:Sort:Descending'|dict_s }}"
+ }
+ },
+ "lengthMenu": [[ {{ oUIBlock.GetOptions()["iPageSize"] }}, {{ oUIBlock.GetOptions()["iPageSize"]*2 }}, {{ oUIBlock.GetOptions()["iPageSize"]*3 }}, {{ oUIBlock.GetOptions()["iPageSize"]*4 }}, -1], [ {{ oUIBlock.GetOptions()["iPageSize"] }}, {{ oUIBlock.GetOptions()["iPageSize"]*2 }}, {{ oUIBlock.GetOptions()["iPageSize"]*3 }}, {{ oUIBlock.GetOptions()["iPageSize"]*4 }}, "{{ 'Portal:Datatables:Language:DisplayLength:All'|dict_s }}"]],
+ "dom": "<'ibo-datatable-toolbar'pil>t<'ibo-datatable-toolbar'pil>",
+ {% if( oUIBlock.GetOptions()["sort"][0] is defined ) %}
+ "order": [[{{ oUIBlock.GetOptions()["sort"][0]}},'{{ oUIBlock.GetOptions()["sort"][1]}}']],
+ {% else %}
+ "order":[],
+ {% endif %}
+ "ordering": true,
+ {% if oUIBlock.GetOption("select_mode") is defined %}
+ "select": {
+ "style": "{{ oUIBlock.GetOption("select_mode") }}"
+ },
+ "rowCallback": function (oRow, oData) {
+ // Hiding pagination if only one page
+ if ($(this).closest('.ibo-panel--body').find('[name=selectionMode]') === "negative") {
+ if (!oData.id in oSelectedItems{{ oUIBlock.GetOption('sTableId') }}) {
+ $(oRow).select();
+ $(oRow).find('td:first-child input').prop('checked', true);
+ }
+ } else {
+ if (oData.id in oSelectedItems{{ oUIBlock.GetOption('sTableId') }}) {
+ $(oRow).select();
+ $(oRow).find('td:first-child input').prop('checked', true);
+ }
+ }
+ },
+ "drawCallback": function () {
+ // Hiding pagination if only one page
+ if ($(this).closest('.ibo-panel--body').find('[name=selectionMode]') === "negative") {
+ $(this).find('[name=selectAll]').checked();
+ $(table).DataTable().rows({page: 'current'}).select();
+ } else {
+ $(this).closest('.dataTables_wrapper').find('.dataTables_paginate, .dataTables_info').show();
+ }
+ },
+ {% endif %}
+ "rowId": "id",
+ "filter": false,
+ "retrieve": true,
+ "destroy": true,
+ "processing": true,
+ "serverSide": true,
+ "columns": [
+ {% if oUIBlock.GetOption("select_mode") is not empty %}
+ {
+ "width": "auto",
+ "searchable": false,
+ "sortable": false,
+ "title":
+ {% if oUIBlock.GetOption("select_mode") != "single" %}
+ '
'
+ {% else %}
+ '
'
+ {% endif %},
+ "type": "html",
+ "data": "",
+ "render": function (data, type, row) {
+ var oCheckboxElem =
+ {% if oUIBlock.GetOption("select_mode") != "single" %}
+ $('
');
+ {% else %}
+ $('
');
+ {% endif %}
+ if (row.limited_access) {
+ oCheckboxElem.html('-');
+ } else {
+ oCheckboxElem.find(':input').attr('data-object-id', row.id).attr('data-target-object-id', row.target_id);
+ }
+ return oCheckboxElem.prop('outerHTML');
+ }
+ },
+ {% endif %}
+ {% for aColumn in oUIBlock.GetDisplayColumns() %}
+ {
+ "width": "auto",
+ "searchable": false,
+ "sortable": true,
+ "title": "{{ aColumn["attribute_label"] }}",
+ "defaultContent": "",
+ "type": "html",
+ 'metadata': {
+ 'object_class': "{{ aColumn["object_class"] }}",
+ 'attribute_code': "{{ aColumn["attribute_code"] }}",
+ 'attribute_type': "{{ aColumn["attribute_type"] }}",
+ 'attribute_label': "{{ aColumn["attribute_label"] }}"
+ },
+ "data": "{{ aColumn["class_alias"] }}/{{ aColumn["attribute_code"] }}",
+ "render": {
+ "display": function (data, type, row) { {{ aColumn["render"]|raw }}},
+ "_": "{{ aColumn["class_alias"] }}/{{ aColumn["attribute_code"] }}"
+ }
+ },
+ {% endfor %}
+ ],
+ "ajax": $.fn.dataTable.pipeline({
+ "url": "{{ oUIBlock.GetAjaxUrl() }}",
+ "data": {{ oUIBlock.GetAjaxData() |raw }},
+ "method": "post",
+ "pages": 5 // number of pages to cache
+ }),
+ "initComplete": function() {
+ if (this.api().page.info().pages === 1) {
+ $('.dataTables_paginate').hide();
+ $('.dataTables_length').hide();
+ }
+ }
+});
+
+oTable{{ oUIBlock.GetId() }}.off('select').on('select', function (oEvent, dt, type, indexes) {
+ var aData = oTable{{ oUIBlock.GetId() }}.rows(indexes).data().toArray();
+ // Checking input
+ $('#{{ oUIBlock.GetId() }} tr[role="row"].selected td:first-child input').prop('checked', true);
+ // Saving values in temp array
+ for (var i in aData) {
+ var iItemId = aData[i].id;
+ if (oSelectedItems{{ oUIBlock.GetOption('sTableId') }}.indexOf(iItemId) === -1) {
+ oSelectedItems{{ oUIBlock.GetOption('sTableId') }}.push(iItemId);
+ }
+ }
+ if ((oSelectedItems{{ oUIBlock.GetOption('sTableId') }}.length === oTable{{ oUIBlock.GetId() }}.page.info()["recordsTotal"] && $(this).closest('.ibo-panel--body').find('[name=selectionMode]').val() === "negative")) {
+ $('#btn_ok_{{ oUIBlock.GetOption('sTableId') }}').prop('disabled', true);
+ } else {
+ $('#btn_ok_{{ oUIBlock.GetOption('sTableId') }}').prop('disabled', false);
+ }
+});
+
+oTable{{ oUIBlock.GetId() }}.off('deselect').on('deselect', function (oEvent, dt, type, indexes) {
+ var aData = oTable{{ oUIBlock.GetId() }}.rows(indexes).data().toArray();
+
+ // Checking input
+ $('#{{ oUIBlock.GetId() }} tr[role="row"]:not(.selected) td:first-child input').prop('checked', false);
+ // Saving values in temp array
+ for (var i in aData) {
+ var iItemId = aData[i].id;
+ if (oSelectedItems{{ oUIBlock.GetOption('sTableId') }}.indexOf(iItemId) > -1) {
+ oSelectedItems{{ oUIBlock.GetOption('sTableId') }}.splice(oSelectedItems{{ oUIBlock.GetOption('sTableId') }}.indexOf(iItemId), 1);
+ }
+ }
+ if ((oSelectedItems{{ oUIBlock.GetOption('sTableId') }}.length === 0 && $(this).closest('.ibo-panel--body').find('[name=selectionMode]').val() === "positive")) {
+ $('#btn_ok_{{ oUIBlock.GetOption('sTableId') }}').prop('disabled', true);
+ } else {
+ $('#btn_ok_{{ oUIBlock.GetOption('sTableId') }}').prop('disabled', false);
+ }
+});
+
+// Handles submit button
+//$('#form_{{ oUIBlock.GetId() }} .form_buttons .form_btn_submit').off('click').on('click', function(oEvent){
+// Extracting value(s) to be send back to the source form
+{% if bMultipleSelect %}
+//var oData = {values: oSelectedItems};
+{% else %}
+/*var oData = {value: {}};
+var sItemId = Object.keys(oSelectedItems)[0];
+var sItemName = oSelectedItems[sItemId];
+
+oData.value[sItemId] = sItemName;*/
+{% endif %}
+
+// Triggering value setting on the source field
+//$('[data-form-path="{{ aSource.sFormPath }}"][data-field-id="{{ aSource.sFieldId }}"]').triggerHandler('set_current_value', oData);
+
+// Closing the modal
+{% if tIsModal is defined and tIsModal == true %}
+//$('#{{ sFormId }}').closest('.modal').modal('hide');
+{% endif %}
+//});
+
+$('#datatable_dlg_{{ oUIBlock.GetId() }}').dialog(
+ {
+ autoOpen: false,
+ title: "{{ 'UI:ListConfigurationTitle'|dict_s }}",
+ width: 500,
+ close: function () { //save data and refresh
+ $('#datatable_dlg_{{ oUIBlock.GetId() }}').DataTableSettings('onDlgCancel');
+ }
+ });
+
+$aOptions = {
+ 'sListId': '{{ oUIBlock.GetId() }}',
+ 'oColumns': {{ oUIBlock.GetResultColumnsAsJson()|raw }},
+ 'sViewLink': '{{ oUIBlock.GetOptions()["bViewLink"] }}',
+ 'iPageSize': '{{ oUIBlock.GetOptions()["iPageSize"] }}',
+ 'sTableId': '{{ oUIBlock.GetOptions()["sTableId"] }}',
+ "sRenderUrl": "{{ oUIBlock.GetAjaxUrl() }}",
+ "sSelectMode": "{{ oUIBlock.GetOptions()["select_mode"] }}",
+ "oData": {{ oUIBlock.GetAjaxData() |raw }},
+ 'oLabels': {"moveup": "{{ 'UI:Button:MoveUp'|dict_s }}", "movedown": "{{ 'UI:Button:MoveDown'|dict_s }}"},
+ 'oDefaultSettings': {{ oUIBlock.GetOptions()["oDefaultSettings"]|raw }}
+};
+
+//if (!typeof $('#datatable_dlg_{{ oUIBlock.GetId() }}').DataTableSettings() !== "undefined")
+if ($('#datatable_dlg_{{ oUIBlock.GetId() }}').DataTableSettings()) {
+ $('#datatable_dlg_{{ oUIBlock.GetId() }}').DataTableSettings("destroy");
+}
+$('#datatable_dlg_{{ oUIBlock.GetId() }}').DataTableSettings($aOptions);
\ No newline at end of file
diff --git a/templates/components/datatable/static/formtable/layout.html.twig b/templates/components/datatable/static/formtable/layout.html.twig
new file mode 100644
index 000000000..16e443328
--- /dev/null
+++ b/templates/components/datatable/static/formtable/layout.html.twig
@@ -0,0 +1,20 @@
+{# @copyright Copyright (C) 2010-2020 Combodo SARL #}
+{# @license http://opensource.org/licenses/AGPL-3.0 #}
+
+
+
+{% set columns = oUIBlock.GetColumns() %}
+
+
+
+ {% for column in columns %}
+
+ {% endfor %}
+
+
+
+ {% for oSubBlock in oUIBlock.GetRows() %}
+ {{ render_block(oSubBlock, {aPage: aPage}) }}
+ {% endfor %}
+
+
\ No newline at end of file
diff --git a/templates/components/datatable/static/formtable/layout.js.twig b/templates/components/datatable/static/formtable/layout.js.twig
new file mode 100644
index 000000000..8868623b2
--- /dev/null
+++ b/templates/components/datatable/static/formtable/layout.js.twig
@@ -0,0 +1,6 @@
+$('#{{ oUIBlock.GetId() }}').DataTable({
+ language: {
+ emptyTable: {{ 'UI:Message:EmptyList:UseAdd'|dict_s }}
+ },
+ search:false
+});
\ No newline at end of file
diff --git a/templates/components/datatable/static/formtablerow/layout.html.twig b/templates/components/datatable/static/formtablerow/layout.html.twig
new file mode 100644
index 000000000..609a3e624
--- /dev/null
+++ b/templates/components/datatable/static/formtablerow/layout.html.twig
@@ -0,0 +1,19 @@
+{# @copyright Copyright (C) 2010-2020 Combodo SARL #}
+{# @license http://opensource.org/licenses/AGPL-3.0 #}
+
+
+ {% for colName,column in oUIBlock.GetColumns() %}
+
+ {% set cellValueHtml = '' %}
+ {% for cellName,cellValue in oUIBlock.GetData() %}
+ {% if cellName == colName %}
+ {% set cellValueHtml = cellValue %}
+ {% endif %}
+ {% endfor %}
+ {% if cellValueHtml is empty %}
+ {% set cellValueHtml = ' ' %}
+ {% endif %}
+ {{ cellValueHtml|raw }}
+
+ {% endfor %}
+
diff --git a/templates/components/datatable/static/formtablerow/layout.js.twig b/templates/components/datatable/static/formtablerow/layout.js.twig
new file mode 100644
index 000000000..e69de29bb
diff --git a/templates/components/datatable/static/layout.html.twig b/templates/components/datatable/static/layout.html.twig
new file mode 100644
index 000000000..3527d1ad4
--- /dev/null
+++ b/templates/components/datatable/static/layout.html.twig
@@ -0,0 +1,48 @@
+{# @copyright Copyright (C) 2010-2020 Combodo SARL #}
+{# @license http://opensource.org/licenses/AGPL-3.0 #}
+
+{% set columns = oUIBlock.GetColumns() %}
+
+
+
+ {% for column in columns %}
+
+ {% endfor %}
+
+
+
+ {% for data in oUIBlock.GetData() %}
+ {% if data['@class'] is not empty %}
+
+ {% else %}
+
+ {% endif %}
+ {% for name,column in columns %}
+ {{ cellValueHtml|raw }}
+ {% endfor %}
+
+ {% endfor %}
+
+
\ No newline at end of file
diff --git a/templates/components/datatable/static/layout.js.twig b/templates/components/datatable/static/layout.js.twig
new file mode 100644
index 000000000..8cafad35f
--- /dev/null
+++ b/templates/components/datatable/static/layout.js.twig
@@ -0,0 +1,47 @@
+{# @copyright Copyright (C) 2010-2020 Combodo SARL #}
+{# @license http://opensource.org/licenses/AGPL-3.0 #}
+
+{% if oUIBlock.GetOptions() is not empty %}
+{% set iPageSize = oUIBlock.GetOptions()["iPageSize"] %}
+{% else %}
+{% set iPageSize = 10 %}
+{% endif %}
+
+$('#{{ oUIBlock.GetId() }}').DataTable({
+ language: {
+ processing: "{{ 'UI:Datatables:Language:Processing'|dict_s }}",
+ search: "{{ 'UI:Datatables:Language:Search'|dict_s }}",
+ lengthMenu: "{{ 'UI:Datatables:Language:LengthMenu'|dict_s }}",
+ zeroRecords: "{{ 'UI:Datatables:Language:ZeroRecords'|dict_s }}",
+ info: "{{ 'UI:Datatables:Language:Info'|dict_s }}",
+ infoEmpty: "",
+ infoFiltered: "({{ 'UI:Datatables:Language:InfoFiltered'|dict_s }})",
+ emptyTable: "{{ 'UI:Datatables:Language:EmptyTable'|dict_s }}",
+ paginate: {
+ first: "<<",
+ previous: "
",
+ next: "
",
+ last: ">>"
+ },
+ aria: {
+ sortAscending: ": {{ 'UI:Datatables:Language:Sort:Ascending'|dict_s }}",
+ sortDescending: ": {{ 'UI:Datatables:Language:Sort:Descending'|dict_s }}"
+ }
+ },
+ order: [],
+ rowId: "id",
+ filter: false,
+ {% if oUIBlock.GetData()|length <= iPageSize %}
+ paging: false,
+ {% endif %}
+ dom: "<'ibo-datatable-toolbar'pil>t<'ibo-datatable-toolbar'pil>",
+ lengthMenu: [[ {{ iPageSize }}, {{ iPageSize*2 }}, {{ iPageSize*3 }}, {{ iPageSize*4 }}, -1], [ {{ iPageSize }}, {{ iPageSize*2 }}, {{ iPageSize*3 }}, {{ iPageSize*4 }}, "{{ 'Portal:Datatables:Language:DisplayLength:All'|dict_s }}"]],
+ columns: [
+ {% for column in oUIBlock.GetColumns() %}
+ {
+ width: "auto",
+ sortable: true
+ },
+ {% endfor %}
+ ]
+});
\ No newline at end of file
diff --git a/templates/components/panel/layout.html.twig b/templates/components/panel/layout.html.twig
index a7336b6e9..cf2071ddb 100644
--- a/templates/components/panel/layout.html.twig
+++ b/templates/components/panel/layout.html.twig
@@ -1,10 +1,10 @@
{# @copyright Copyright (C) 2010-2020 Combodo SARL #}
{# @license http://opensource.org/licenses/AGPL-3.0 #}
{% apply spaceless %}
-
![](\"../images/transp-lock.png\"){kind=spacer}
";
$sTip = '';
foreach($aReasons as $aRow)
{
@@ -4339,7 +4216,6 @@ EOF
$sHTMLValue .= '';
$aFieldsMap[$sAttCode] = $sInputId;
- $sComment .= $sSynchroIcon;
}
else
{
@@ -4388,7 +4264,6 @@ HTML
public function GetExpectedAttributes($sCurrentState, $sStimulus, $bOnlyNewOnes)
{
$aTransitions = $this->EnumTransitions();
- $aStimuli = MetaModel::EnumStimuli(get_class($this));
if (!isset($aTransitions[$sStimulus]))
{
// Invalid stimulus
@@ -4709,6 +4584,7 @@ EOF
*/
public static function DoBulkModify($oP, $sClass, $aSelectedObj, $sCustomOperation, $bPreview, $sCancelUrl, $aContextData = array())
{
+ /** @var string[] $aHeaders */
$aHeaders = array(
'form::select' => array(
'label' => "",
@@ -4745,7 +4621,7 @@ EOF
$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
foreach($aSelectedObj as $iId)
{
- set_time_limit($iLoopTimeLimit);
+ set_time_limit(intval($iLoopTimeLimit));
/** @var \cmdbAbstractObject $oObj */
$oObj = MetaModel::GetObject($sClass, $iId);
$aErrors = $oObj->UpdateObjectFromPostedForm('');
@@ -4777,14 +4653,13 @@ EOF
$oObj->DBUpdate();
}
}
- set_time_limit($iPreviousTimeLimit);
+ set_time_limit(intval($iPreviousTimeLimit));
$oP->Table($aHeaders, $aRows);
if ($bPreview)
{
$sFormAction = utils::GetAbsoluteUrlAppRoot().'pages/UI.php'; // No parameter in the URL, the only parameter will be the ones passed through the form
// Form to submit:
$oP->add("