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

Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Joan Sanchez 2021-04-12 22:26:30 +02:00
parent de769a2565 db81d7d6d4
commit 7e29c865fc
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
back/methods/chat/notifyIssues.js
View File

@ -21,7 +21,10 @@ module.exports = Self => {
JOIN ost_user_account ua ON t.user_id = ua.user_id
JOIN ost_ticket__cdata td ON t.ticket_id = td.ticket_id
JOIN ost_ticket_priority tp ON td.priority = tp.priority_id
WHERE tp.priority = 'emergency' AND t.staff_id = 0
LEFT JOIN ost_department dept ON dept.id = t.dept_id
WHERE tp.priority = 'emergency'
AND (t.staff_id = 0 AND t.team_id = 0)
AND dept.code = 'IT'
`);
if (!tickets.length) return;

2
back/methods/chat/spec/notifyIssue.spec.js
View File

@ -27,7 +27,7 @@ describe('Chat notifyIssue()', () => {
username: 'batman',
subject: 'Issue title'}
]);
const expectedMessage = `@all ➔ There's a new urgent ticket:\r\n[ID: *00001* - Issue title (@batman)](https://osticket.verdnatura.es/scp/tickets.php?id=1)`;
const expectedMessage = `@all ➔ There's a new urgent ticket:\r\n[ID: *00001* - Issue title (@batman)](https://cau.verdnatura.es/scp/tickets.php?id=1)`;
const department = await app.models.Department.findById(departmentId);
let orgChatName = department.chatName;