scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-06 15:05:26 +08:00
Code Issues Projects Releases Packages Wiki Activity

fixed bug with assigned repository items [fixes SCI-2040]

Browse source
This commit is contained in:
zmagod 2018-02-12 10:49:35 +01:00
parent 128f15f984
commit 27b7aff3ea
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/assets/javascripts/repositories/repository_datatable.js
View file

@ -176,7 +176,14 @@ var RepositoryDatatable = (function(global) {
TABLE.column(i).visible(visibility); TABLE.column(i).visible(visibility);
TABLE.setColumnSearchable(i, visibility); TABLE.setColumnSearchable(i, visibility);
} }
// Datatables triggers this action about 3 times
// sometimes on the first iteration the oSettings._colReorder is null
// and the fnOrder rises an error that breaks the table
// here I added a null guard for that case.
// @todo we need to find out why the tables are loaded multiple times
if( oSettings._colReorder ) {
oSettings._colReorder.fnOrder(myData.ColReorder); oSettings._colReorder.fnOrder(myData.ColReorder);
}
TABLE.on('mousedown', function() { TABLE.on('mousedown', function() {
$('#repository-columns-dropdown').removeClass('open'); $('#repository-columns-dropdown').removeClass('open');
}); });
@ -445,15 +452,21 @@ var RepositoryDatatable = (function(global) {
$('#assigned-repo-records').on('click', function() { $('#assigned-repo-records').on('click', function() {
viewAssigned = 'assigned'; viewAssigned = 'assigned';
TABLE.ajax.reload(function() { var promiseReload = new Promise(function(resolve) {
resolve(TABLE.ajax.reload());
});
promiseReload.then(function() {
initRowSelection(); initRowSelection();
}, false); })
}); });
$('#all-repo-records').on('click', function() { $('#all-repo-records').on('click', function() {
viewAssigned = 'all'; viewAssigned = 'all';
TABLE.ajax.reload(function() { var promiseReload = new Promise(function(resolve) {
resolve(TABLE.ajax.reload());
});
promiseReload.then(function() {
initRowSelection(); initRowSelection();
}, false); })
}); });
}; };