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

Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details

This commit is contained in:
Joan Sanchez 2020-02-28 07:34:26 +01:00
parent 9d513878a1 56b986ff95
commit 220f36d795
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
back/methods/chat/sendCheckingPresence.js
View File

@ -37,7 +37,7 @@ module.exports = Self => {
} }
}); });
const department = workerDepartment && workerDepartment.department(); const department = workerDepartment && workerDepartment.department();
const channelName = department.chatName; const channelName = department && department.chatName;
if (channelName) if (channelName)
return Self.send(ctx, `#${channelName}`, `@${account.name} => ${message}`); return Self.send(ctx, `#${channelName}`, `@${account.name} => ${message}`);

2
modules/worker/back/models/calendar-holidays-type.json
View File

@ -14,7 +14,7 @@
"name": { "name": {
"type": "String" "type": "String"
}, },
"rgb": { "hexColour": {
"type": "String" "type": "String"
} }
}, },