verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 63 Releases Wiki Activity

Merge pull request 'feat: rollback limit' (!2910) from hotfix-rollbackLimit into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test Build queued... Details 

Reviewed-on: #2910
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
This commit is contained in:
Jorge Penadés 2024-09-03 10:16:12 +00:00
parent 0c3349dc03 90b8187a4f
commit d781a8ab8c
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
loopback/common/models/vn-model.js
View File

@ -27,25 +27,25 @@ module.exports = function(Self) {
}; };
}); });
this.beforeRemote('**', async ctx => { // this.beforeRemote('**', async ctx => {
if (!this.hasFilter(ctx)) return; // if (!this.hasFilter(ctx)) return;
const defaultLimit = this.app.orm.selectLimit; // const defaultLimit = this.app.orm.selectLimit;
const filter = ctx.args.filter || {limit: defaultLimit}; // const filter = ctx.args.filter || {limit: defaultLimit};
if (filter.limit > defaultLimit) { // if (filter.limit > defaultLimit) {
filter.limit = defaultLimit; // filter.limit = defaultLimit;
ctx.args.filter = filter; // ctx.args.filter = filter;
} // }
}); // });
this.afterRemote('**', async ctx => { // this.afterRemote('**', async ctx => {
if (!this.hasFilter(ctx)) return; // if (!this.hasFilter(ctx)) return;
const {result} = ctx; // const {result} = ctx;
const length = Array.isArray(result) ? result.length : result ? 1 : 0; // const length = Array.isArray(result) ? result.length : result ? 1 : 0;
if (length >= this.app.orm.selectLimit) throw new UserError('Too many records'); // if (length >= this.app.orm.selectLimit) throw new UserError('Too many records');
}); // });
// Register field ACL validation // Register field ACL validation
/* /*

12
loopback/server/boot/orm.js
View File

@ -1,6 +1,6 @@
module.exports = async function(app) { // module.exports = async function(app) {
if (!app.orm) { // if (!app.orm) {
const ormConfig = await app.models.OrmConfig.findOne(); // const ormConfig = await app.models.OrmConfig.findOne();
app.orm = ormConfig; // app.orm = ormConfig;
} // }
}; // };