Skip to content

Commit 9fb2304

Browse files
committed
use limit and skip paging params for @Associations
1 parent 69702bd commit 9fb2304

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

duster/helpers/core/engine.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -571,6 +571,8 @@ module.exports = function(app, dust)
571571
var skip = context.resolve(params.skip);
572572
var nodeSort = context.resolve(params.nodeSort);
573573
var nodeSortDirection = context.resolve(params.nodeSortDirection);
574+
var nodeSkip = context.resolve(params.nodeSkip);
575+
var nodeLimit = context.resolve(params.nodeLimit);
574576

575577
// as
576578
var as = context.resolve(params.as);
@@ -592,6 +594,14 @@ module.exports = function(app, dust)
592594
{
593595
skip = parseInt(skip);
594596
}
597+
if (isDefined(nodeLimit))
598+
{
599+
nodeLimit = parseInt(nodeLimit);
600+
}
601+
if (isDefined(nodeSkip))
602+
{
603+
nodeSkip = parseInt(nodeSkip);
604+
}
595605

596606
// TRACKER: START
597607
tracker.start(context);
@@ -732,7 +742,8 @@ module.exports = function(app, dust)
732742
}
733743

734744
pagination = {
735-
limit: otherNodeIds.length
745+
limit: nodeLimit || limit || otherNodeIds.length,
746+
skip: nodeSkip || skip || 0
736747
};
737748
if (nodeSort)
738749
{

middleware/form/form.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,10 @@ exports = module.exports = function()
143143
}, function(err, response, body) {
144144

145145
console.log("Response error: " + JSON.stringify(err));
146-
console.log("Response: " + response);
147-
console.log("Body: " + JSON.stringify(body));
146+
console.log("Response: " + JSON.stringify(response,null,2));
147+
console.log("Body: " + JSON.stringify(body,null,2));
148148

149-
if (err)
149+
if (err || (response && response.body && response.body.error))
150150
{
151151
if (failureUrl)
152152
{
@@ -157,10 +157,12 @@ exports = module.exports = function()
157157
res.status(500);
158158
res.json({
159159
"ok": false,
160-
"err": err,
160+
"err": err || response.body.message,
161161
"message": body
162162
});
163163
}
164+
165+
return;
164166
}
165167

166168
if (successUrl)

0 commit comments

Comments
 (0)