scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #995 from ZmagoD/zd_SCI_2040

Browse source 
fixed bug with assigned repository items [fixes SCI-2040]
This commit is contained in:
Zmago Devetak 2018-02-15 13:05:30 +01:00 committed by GitHub
parent 0583979cf9 78e902f316
commit e0510ab448
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -176,7 +176,14 @@ var RepositoryDatatable = (function(global) {
TABLE.column(i).visible(visibility);
TABLE.setColumnSearchable(i, visibility);
}
oSettings._colReorder.fnOrder(myData.ColReorder);
// 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);
}
TABLE.on('mousedown', function() {
$('#repository-columns-dropdown').removeClass('open');
});
@ -444,16 +451,24 @@ var RepositoryDatatable = (function(global) {
});
$('#assigned-repo-records').on('click', function() {
var promiseReload;
viewAssigned = 'assigned';
TABLE.ajax.reload(function() {
promiseReload = new Promise(function(resolve) {
resolve(TABLE.ajax.reload());
});
promiseReload.then(function() {
initRowSelection();
}, false);
})
});
$('#all-repo-records').on('click', function() {
var promiseReload;
viewAssigned = 'all';
TABLE.ajax.reload(function() {
promiseReload = new Promise(function(resolve) {
resolve(TABLE.ajax.reload());
});
promiseReload.then(function() {
initRowSelection();
}, false);
})
});
};