diff --git a/front/salix/components/log/index.html b/front/salix/components/log/index.html index eb6e4223e..45074bea3 100644 --- a/front/salix/components/log/index.html +++ b/front/salix/components/log/index.html @@ -3,6 +3,8 @@ url="{{$ctrl.url}}" filter="$ctrl.filter" link="{originFk: $ctrl.originId}" + where="{changedModel: $ctrl.changedModel, + changedModelId: $ctrl.changedModelId}" data="$ctrl.logs" limit="20" auto-load="true"> @@ -14,9 +16,9 @@ Date User - Model + Model Action - Name + Name Changes @@ -31,13 +33,13 @@ translate>{{::log.user.name || 'System' | translate}} - + {{::log.changedModel}} {{::$ctrl.actionsText[log.action]}} - + {{::log.changedModelValue}} diff --git a/front/salix/components/log/index.js b/front/salix/components/log/index.js index 75249d1ee..f0306fed6 100644 --- a/front/salix/components/log/index.js +++ b/front/salix/components/log/index.js @@ -57,6 +57,10 @@ export default class Controller extends Section { } } + get showModelName() { + return !(this.changedModel && this.changedModelId); + } + formatValue(value) { if (typeof value === 'string' && validDate.test(value)) value = new Date(value); @@ -86,6 +90,8 @@ ngModule.vnComponent('vnLog', { bindings: { model: '<', originId: '<', + changedModel: '