Mintplex-Labs/express-admin
1
0
Fork 0
mirror of https://github.com/Mintplex-Labs/express-admin.git synced 2026-07-19 13:34:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor listview route data method

Browse Source
This commit is contained in:
simov
2014-09-11 11:16:57 +03:00
parent 52253d54ed
commit e74ea3064e
2 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/listview/filter.js
+1 -1
View File
@@ -52,7 +52,7 @@ exports.getColumns = function (args) {
for (var j=0; j < args.config.listview.filter.length; j++) {
if (args.config.columns[i].name == args.config.listview.filter[j]) {
var column = dcopy(args.config.columns[i]);
column.key = ['filter[',column.name,']'].join('');
column.key = 'filter['+column.name+']';
filter.push(column);
}
}
routes/listview.js
+36 -18
View File
@@ -1,5 +1,6 @@
var dcopy = require('deep-copy');
var async = require('async'),
dcopy = require('deep-copy');
var qb = require('../lib/qb')(),
data = require('../lib/data'),
format = require('../lib/format');
@@ -36,24 +37,41 @@ function _data (req, res, next) {
args.filter = filter.prepareSession(req, args);
qb.lst.select(args);
events.preList(req, res, args, function () {
data.list.get(args, function (err, ddata) {
if (err) return next(err);
data.pagination.get(args, function (err, pager) {
if (err) return next(err);
// always should be in front of filter.getColumns
// as it may reduce args.config.columns
var order = filter.getOrderColumns(req, args);
args.config.columns = filter.getColumns(args);
data.otm.get(args, function (err) {
if (err) return next(err);
data.stc.get(args);
render(req, res, args, ddata, pager, order, next);
var results = {};
async.series([
events.preList.bind(events, req, res, args),
function (done) {
data.list.get(args, function (err, result) {
if (err) return done(err);
results.data = result;
done();
});
});
});
},
function (done) {
data.pagination.get(args, function (err, pager) {
if (err) return done(err);
// always should be in front of filter.getColumns
// as it may reduce args.config.columns
results.order = filter.getOrderColumns(req, args);
args.config.columns = filter.getColumns(args);
results.pager = pager;
done();
});
},
function (done) {
data.otm.get(args, function (err) {
if (err) return done(err);
data.stc.get(args);
done();
});
}
], function (err) {
if (err) return next(err);
render(
req, res, args,
results.data, results.pager, results.order,
next
);
});
}