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

fix: ticket #216260 buy_recalcPrices #2916

Merged
robert merged 7 commits from ticket216260-buy_recalcPrices into master 2024-09-05 05:39:26 +00:00
Conversation 1 Commits 7 Files Changed 1 +21 -21
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d52dc788c8 - Show all commits

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

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

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

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