Merge branch 'dev' into 5576-reestructurar-directorio-imagenes

Merge pull request 'refs #6398 ' (!1896 ) from 6398-changes into dev
Reviewed-on: #1896 Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-12-20 08:09:33 +00:00 · 2023-12-20 08:01:09 +00:00 · 2023-12-19 12:58:20 +01:00 · 2023-12-19 10:04:56 +00:00 · 2023-12-19 10:12:03 +01:00 · 2023-12-19 09:43:09 +01:00
3 changed files with 10 additions and 10 deletions
--- a/db/changes/235201/02-views.sql
+++ b/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`.`worker` AS `worker`,
    `ts`.`code` AS `code`,
    `ts`.`updated` AS `updated`,
    `ts`.`isPicked` AS `isPicked`
--- a/modules/ticket/back/models/ticket-state.json
+++ b/modules/ticket/back/models/ticket-state.json
@ -34,9 +34,9 @@
            "foreignKey": "stateFk"
        },
        "user": {
-			"type": "belongsTo",
-			"model": "VnUser",
-			"foreignKey": "userFk"
-		}
+            "type": "belongsTo",
+            "model": "VnUser",
+            "foreignKey": "workerFk"
+        }
    }
 }
--- a/modules/ticket/back/models/ticket-tracking.json
+++ b/modules/ticket/back/models/ticket-tracking.json
@ -37,9 +37,9 @@
            "foreignKey": "stateFk"
        },
        "user": {
-			"type": "belongsTo",
-			"model": "VnUser",
-			"foreignKey": "userFk"
-		}
+            "type": "belongsTo",
+            "model": "VnUser",
+            "foreignKey": "userFk"
+        }
    }
 }
Author	SHA1	Message	Date
Javier Segarra	f450472915	Merge branch 'dev' into 5576-reestructurar-directorio-imagenes gitea/salix/pipeline/head There was a failure building this commit Details	2023-12-20 08:09:33 +00:00
David Domenech	f33e343acb	Merge pull request 'refs #6398 ' (!1896 ) from 6398-changes into dev gitea/salix/pipeline/head This commit looks good Details Reviewed-on: #1896 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-12-20 08:01:09 +00:00
David Domenech	5936a129da	refs #6398 gitea/salix/pipeline/head This commit looks good Details	2023-12-19 12:58:20 +01:00
David Domenech	86f340248f	Merge pull request 'fix: refs #6398 Changed alias of views' (!1895 ) from 6398-fix into dev gitea/salix/pipeline/head This commit looks good Details Reviewed-on: #1895 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-12-19 10:04:56 +00:00
Guillermo Bonet	17e177b788	fix: refs #6398 Fix tests back gitea/salix/pipeline/head This commit looks good Details	2023-12-19 10:12:03 +01:00
David Domenech	d60f2a7f88	fix: refs #6398 Changed alias of views gitea/salix/pipeline/head There was a failure building this commit Details	2023-12-19 09:43:09 +01:00