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

7773-testToMaster_2430 #2774

Merged
alexm merged 368 commits from 7773-testToMaster_2430 into master 2024-07-23 06:21:03 +00:00
Conversation 0 Commits 368 Files Changed 248 +7 -4
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4795b1ad88 - Show all commits

7
modules/worker/back/methods/worker/new.js
View File

@ -193,9 +193,13 @@ module.exports = Self => {
} }
await user.updateAttribute('email', email, myOptions); await user.updateAttribute('email', email, myOptions);
const {countryFk} = await Self.app.models.Province.findById(provinceFk, { let countryFk;
if (provinceFk) {
const province = await Self.app.models.Province.findById(provinceFk, {
fields: ['countryFk'] fields: ['countryFk']
}); });
countryFk = province.countryFk;
}
await models.Worker.create({ await models.Worker.create({
id: user.id, id: user.id,
firstName, firstName,
@ -205,7 +209,6 @@ module.exports = Self => {
fi, fi,
birth, birth,
originCountryFk: countryFk originCountryFk: countryFk
}, myOptions); }, myOptions);
if (tx) await tx.commit(); if (tx) await tx.commit();