merge master

2019-04-04 12:47:02 +02:00 · 2019-04-04 12:47:02 +02:00 · 93bca3b3f0
parent d1a179c1c3 4861b789f7
commit 93bca3b3f0
2 changed files with 3 additions and 2 deletions
--- a/modules/item/back/models/item.json
+++ b/modules/item/back/models/item.json
@ -2,7 +2,8 @@
    "name": "Item",
 	"base": "Loggable",
 	"log": {
-		"model":"ItemLog"
+        "model":"ItemLog",
+        "showField": "id"
 	},
    "options": {
        "mysql": {
--- a/modules/ticket/back/models/ticket-weekly.json
+++ b/modules/ticket/back/models/ticket-weekly.json
@ -27,4 +27,4 @@
            "foreignKey": "ticketFk"
        }
    }
-}
+}