item history functionality, awaiting for clientfilters refactor
This commit is contained in:
parent
2cc6dfd553
commit
03faa09284
|
@ -1,4 +1,4 @@
|
|||
<mg-ajax path="/item/api/Items/getLog" options="vnIndex"></mg-ajax>
|
||||
<mg-ajax path="/item/api/ItemLogs/getLog" options="vnIndex"></mg-ajax>
|
||||
<vn-card pad-medium>
|
||||
<vn-vertical pad-medium>
|
||||
<vn-title vn-one margin-large-bottom>Item history</vn-title>
|
||||
|
@ -14,8 +14,8 @@
|
|||
class="list list-element text-center"
|
||||
pad-small-bottom
|
||||
ng-repeat="itemLog in index.model.instances track by itemLog.id">
|
||||
<vn-one pad-medium-h>{{::itemLog.originFk}}</vn-one>
|
||||
<vn-two pad-medium-h>{{::itemLog.userFk}}</vn-two>
|
||||
<vn-one pad-medium-h>{{::itemLog.origin.name}}</vn-one>
|
||||
<vn-two pad-medium-h>{{::itemLog.user.name}}</vn-two>
|
||||
<vn-one pad-medium-h>{{::itemLog.action}}</vn-one>
|
||||
<vn-one pad-medium-h>{{::itemLog.creationDate | date:'dd/MM/yyyy HH:mm'}}</vn-one>
|
||||
<vn-one pad-medium-h>{{::itemLog.description}}</vn-one>
|
||||
|
|
|
@ -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"
|
||||
}]
|
||||
};
|
||||
}
|
||||
};
|
||||
|
|
|
@ -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'});
|
||||
|
|
|
@ -21,12 +21,12 @@
|
|||
}
|
||||
},
|
||||
"relations": {
|
||||
"originFk": {
|
||||
"origin": {
|
||||
"type": "belongsTo",
|
||||
"model": "Origin",
|
||||
"foreignKey": "originFk"
|
||||
},
|
||||
"userFk": {
|
||||
"user": {
|
||||
"type": "belongsTo",
|
||||
"model": "User",
|
||||
"foreignKey": "userFk"
|
||||
|
|
Loading…
Reference in New Issue