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

fix: refs #6398 Changed alias of views #1895

Merged
davidd merged 2 commits from 6398-fix into dev 2023-12-19 10:05:00 +00:00
Conversation 0 Commits 2 Files Changed 3 +12 -12
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d60f2a7f88 - Show all commits

4
db/changes/235201/02-views.sql
View File

@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
VIEW `vn`.`ticketState` VIEW `vn`.`ticketState`
AS SELECT `tt`.`created` AS `updated`, AS SELECT `tt`.`created` AS `updated`,
`tt`.`stateFk` AS `stateFk`, `tt`.`stateFk` AS `stateFk`,
`tt`.`userFk` AS `userFk`, `tt`.`userFk` AS `workerFk`,
`tls`.`ticketFk` AS `ticketFk`, `tls`.`ticketFk` AS `ticketFk`,
`s`.`id` AS `state`, `s`.`id` AS `state`,
`s`.`order` AS `productionOrder`, `s`.`order` AS `productionOrder`,
@ -40,7 +40,7 @@ SELECT
`ts`.`state` AS `state`, `ts`.`state` AS `state`,
`ts`.`productionOrder` AS `productionOrder`, `ts`.`productionOrder` AS `productionOrder`,
`ts`.`alertLevel` AS `alertLevel`, `ts`.`alertLevel` AS `alertLevel`,
`ts`.`userFk` AS `userFk`, `ts`.`userFk` AS `worker`,
alexm commented 2023-12-19 09:48:43 +00:00
Review
Copy Link

worker? i no workerFk?

worker? i no workerFk?
`ts`.`code` AS `code`, `ts`.`code` AS `code`,
`ts`.`updated` AS `updated`, `ts`.`updated` AS `updated`,
`ts`.`isPicked` AS `isPicked` `ts`.`isPicked` AS `isPicked`

4
modules/ticket/back/methods/ticket/state.js
View File

@ -51,12 +51,12 @@ module.exports = Self => {
params.stateFk = state.id; params.stateFk = state.id;
} }
if (!params.userFk) { if (!params.workerFk) {
const worker = await models.Worker.findOne({ const worker = await models.Worker.findOne({
where: {id: userId} where: {id: userId}
}, myOptions); }, myOptions);
params.userFk = worker.id; params.workerFk = worker.id;
} }
const ticketState = await models.TicketState.findById(params.ticketFk, { const ticketState = await models.TicketState.findById(params.ticketFk, {

2
modules/ticket/back/models/ticket-state.json
View File

@ -36,7 +36,7 @@
"user": { "user": {
"type": "belongsTo", "type": "belongsTo",
"model": "VnUser", "model": "VnUser",
"foreignKey": "userFk" "foreignKey": "workerFk"
} }
} }
} }