freifunk/ffffng
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Sorting of tasks and nodes in admin panel.

Browse source
This commit is contained in:
baldo 2016-06-07 11:58:29 +02:00
parent ce2359a094
commit 954b7a3920
7 changed files with 77 additions and 21 deletions
server/services
nodeService.js

8
server/services/nodeService.js
View file

@ -217,6 +217,7 @@ angular.module('ffffng')
var pending = value === 'pending';
node.monitoring = active || pending;
node.monitoringConfirmed = active;
node.monitoringState = active ? 'active' : (pending ? 'pending' : '');
} else if (key === 'monitoringToken') {
nodeSecrets.monitoringToken = value;
} else {
@ -369,13 +370,12 @@ angular.module('ffffng')
deleteNodeFile(token, callback);
},
getAllNodes: function (page, perPage, callback) {
var files = _.sortBy(findNodeFiles({}));
getAllNodes: function (callback) {
var files = findNodeFiles({});
var total = files.length;
var pageFiles = files.slice((page - 1) * perPage, page * perPage);
async.mapLimit(
pageFiles,
files,
MAX_PARALLEL_NODES_PARSING,
parseNodeFile,
function (err, nodes) {