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

Enhancement: prevent reloading a list while the configuration dialog is open.

Browse Source 
SVN:trunk[2206]
This commit is contained in:
Denis Flaven
2012-09-25 10:03:41 +00:00
parent ab1143e0e1
commit 8d56d8eb79
2 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
js/datatable.js
View File

@@ -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);
}
});
});

30
js/utils.js
View File

@@ -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');
}
);
}
}
/**