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

8179-testToMaster #3176

Merged
alexm merged 407 commits from 8179-testToMaster into master 2024-11-12 06:41:52 +00:00
Conversation 0 Commits 407 Files Changed 335 +6 -7
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e334152acc - Show all commits

13
modules/ticket/back/methods/ticket-request/filter.js
View File

@ -83,7 +83,12 @@ module.exports = Self => {
const models = Self.app.models;
const args = ctx.args;
// Apply filter by team
if (typeof options == 'object')
Object.assign(myOptions, options);
if (ctx.args.mine)
ctx.args.attenderFk = userId;
const teamMembersId = [];
if (args.myTeam != null) {
const worker = await models.Worker.findById(userId, {
@ -99,12 +104,6 @@ module.exports = Self => {
teamMembersId.push(userId);
}
if (typeof options == 'object')
Object.assign(myOptions, options);
if (ctx.args.mine)
ctx.args.attenderFk = userId;
let where = buildFilter(ctx.args, (param, value) => {
switch (param) {
case 'search':