Merge branch 'dev' into 6005-backupLabeler

db/changes/235201/02-views.sql

@@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost`
 	VIEW `vn`.`ticketState`
 AS SELECT `tt`.`created` AS `updated`,
 	`tt`.`stateFk` AS `stateFk`,
-	`tt`.`userFk` AS `userFk`,
+	`tt`.`userFk` AS `workerFk`,
 	`tls`.`ticketFk` AS `ticketFk`,
 	`s`.`id` AS `state`,
 	`s`.`order` AS `productionOrder`,
@@ -40,7 +40,7 @@ SELECT
     `ts`.`state` AS `state`,
     `ts`.`productionOrder` AS `productionOrder`,
     `ts`.`alertLevel` AS `alertLevel`,
-    `ts`.`userFk` AS `userFk`,
+    `ts`.`userFk` AS `worker`,
     `ts`.`code` AS `code`,
     `ts`.`updated` AS `updated`,
     `ts`.`isPicked` AS `isPicked`

modules/ticket/back/models/ticket-state.json

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