verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 49 Releases Wiki Activity

#7884 - Add new param to search days backward #2875

Closed
jsegarra wants to merge 2 commits from 7884_daysBackward into dev
pull from: 7884_daysBackward
merge into: verdnatura:dev
Conversation 0 Commits 2 Files Changed 2 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2aec9db824 - Show all commits

2
modules/entry/back/methods/entry/filter.js
View File

@ -233,7 +233,7 @@ module.exports = Self => {
params: [ctx.args.daysBefore] params: [ctx.args.daysBefore]
}); });
} }
stmt.merge({sql: ')'}); if (ctx.args.daysAfter) stmt.merge({sql: ')'});
stmt.merge(conn.makeSuffix(filter)); stmt.merge(conn.makeSuffix(filter));
const itemsIndex = stmts.push(stmt) - 1; const itemsIndex = stmts.push(stmt) - 1;

2
modules/entry/back/methods/entry/specs/filter.spec.js
View File

@ -55,7 +55,7 @@ describe('Entry filter()', () => {
try { try {
const ctx = { const ctx = {
args: {days: 6}, args: {daysAfter: 6},
req: {accessToken: {userId: 1102}} req: {accessToken: {userId: 1102}}
}; };