diff --git a/client/item/src/history/item-history.html b/client/item/src/history/item-history.html index fe1c1faf75..3409dc04b6 100644 --- a/client/item/src/history/item-history.html +++ b/client/item/src/history/item-history.html @@ -1,4 +1,4 @@ - + Item history @@ -14,8 +14,8 @@ class="list list-element text-center" pad-small-bottom ng-repeat="itemLog in index.model.instances track by itemLog.id"> - {{::itemLog.originFk}} - {{::itemLog.userFk}} + {{::itemLog.origin.name}} + {{::itemLog.user.name}} {{::itemLog.action}} {{::itemLog.creationDate | date:'dd/MM/yyyy HH:mm'}} {{::itemLog.description}} diff --git a/services/item/common/methods/item/getLog.js b/services/item/common/methods/item/getLog.js index 3b214e5c88..3c0c1e4137 100644 --- a/services/item/common/methods/item/getLog.js +++ b/services/item/common/methods/item/getLog.js @@ -7,7 +7,13 @@ module.exports = Self => { itemFk: params.itemFk }, skip: (params.page - 1) * params.size, - limit: params.size + limit: params.size, + include: [{ + relation: "origin" + }, + { + relation: "user" + }] }; } }; diff --git a/services/item/common/models/item.js b/services/item/common/models/item.js index 3cbc622bd9..2c193b587b 100644 --- a/services/item/common/models/item.js +++ b/services/item/common/models/item.js @@ -1,6 +1,5 @@ module.exports = function(Self) { require('../methods/item/filter.js')(Self); - require('../methods/item/getLog.js')(Self); Self.validatesPresenceOf('name', {message: 'Cannot be blank'}); Self.validatesPresenceOf('originFk', {message: 'Cannot be blank'}); diff --git a/services/item/common/models/itemLog.json b/services/item/common/models/itemLog.json index 63777113f5..60a105dffe 100644 --- a/services/item/common/models/itemLog.json +++ b/services/item/common/models/itemLog.json @@ -21,12 +21,12 @@ } }, "relations": { - "originFk": { + "origin": { "type": "belongsTo", "model": "Origin", "foreignKey": "originFk" }, - "userFk": { + "user": { "type": "belongsTo", "model": "User", "foreignKey": "userFk"