Merge branch 'test' into dev

fix: refs #8227 Roadmap columns
2025-02-14 12:36:24 +01:00 · 2025-02-14 12:36:06 +01:00
2 changed files with 3 additions and 6 deletions
--- a/modules/route/back/models/roadmap.json
+++ b/modules/route/back/models/roadmap.json
@ -33,7 +33,7 @@
        "observations": {
            "type": "string"
        },
-        "userFk": {
+        "editorFk": {
            "type": "number"
        },
        "price": {
--- a/modules/route/back/models/roadmapStop.json
+++ b/modules/route/back/models/roadmapStop.json
@ -15,16 +15,13 @@
        "roadmapFk": {
            "type": "number"
        },
-        "addressFk": {
-            "type": "number"
-        },
        "eta": {
            "type": "date"
        },
        "description": {
            "type": "string"
        },
-        "userFk": {
+        "editorFk": {
            "type": "number"
        }
    },
@ -37,7 +34,7 @@
        "address": {
            "type": "belongsTo",
            "model": "RoadmapAddress",
-            "foreignKey": "addressFk"
+            "foreignKey": "roadmapAddressFk"
        }
    }
 }
Author	SHA1	Message	Date
Guillermo Bonet	c79867188a	Merge branch 'test' into dev gitea/salix/pipeline/head There was a failure building this commit Details	2025-02-14 12:36:24 +01:00
Guillermo Bonet	dce263992e	fix: refs #8227 Roadmap columns gitea/salix/pipeline/head This commit looks good Details	2025-02-14 12:36:06 +01:00