diff --git a/js/datatable.js b/js/datatable.js index 65da32534..8232d91cc 100644 --- a/js/datatable.js +++ b/js/datatable.js @@ -132,7 +132,7 @@ $(function() if (oSettings.val() == 'defaults') { oOptions = { iPageSize: this.options.oDefaultSettings.iDefaultPageSize, - oColumns: this.options.oDefaultSettings.oColumns, + oColumns: this.options.oDefaultSettings.oColumns }; } else @@ -247,6 +247,14 @@ $(function() dlgElement.find('input[name=page_size]').val(this.originalState.iDefaultPageSize); dlgElement.find(':itop-fieldsorter').fieldsorter('option', { fields: this.originalState.oFields }); + }, + IsDialogOpen: function() + { + var sId = new String(this.element.attr('id')); + var sListId = sId.replace('datatable_', ''); + var oDlgOpen = $('#datatable_dlg_'+sListId+' :visible'); + + return (oDlgOpen.length > 0); } }); }); \ No newline at end of file diff --git a/js/utils.js b/js/utils.js index c009fca43..0cd9e72c7 100644 --- a/js/utils.js +++ b/js/utils.js @@ -74,16 +74,26 @@ function TruncateList(divId, iLimit, sNewLabel, sLinkLabel) */ function ReloadBlock(divId, sStyle, sSerializedFilter, sExtraParams) { - $('#'+divId).block(); - //$('#'+divId).blockUI(); - $.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?style='+sStyle, - { operation: 'ajax', filter: sSerializedFilter, extra_params: sExtraParams }, - function(data){ - $('#'+divId).empty(); - $('#'+divId).append(data); - $('#'+divId).removeClass('loading'); - } - ); + // Check if the user is not editing the list properties right now + var bDialogOpen = false; + var oDataTable = $('#'+divId+' :itop-datatable'); + if (oDataTable.length > 0) + { + bDialogOpen = oDataTable.datatable('IsDialogOpen'); + } + if (!bDialogOpen) + { + $('#'+divId).block(); + + $.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?style='+sStyle, + { operation: 'ajax', filter: sSerializedFilter, extra_params: sExtraParams }, + function(data){ + $('#'+divId).empty(); + $('#'+divId).append(data); + $('#'+divId).removeClass('loading'); + } + ); + } } /**