verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 54 Releases Wiki Activity

fixes #3302 log front modificaciones #1198

Merged
alexandre merged 10 commits from 3302-logFormat into dev 2022-12-23 08:04:01 +00:00
Conversation 0 Commits 10 Files Changed 11 +12 -4
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 27e0c2d0be - Show all commits

10
front/salix/components/log/index.html
View File

@ -3,6 +3,8 @@
url="{{$ctrl.url}}" url="{{$ctrl.url}}"
filter="$ctrl.filter" filter="$ctrl.filter"
link="{originFk: $ctrl.originId}" link="{originFk: $ctrl.originId}"
where="{changedModel: $ctrl.changedModel,
changedModelId: $ctrl.changedModelId}"
data="$ctrl.logs" data="$ctrl.logs"
limit="20" limit="20"
auto-load="true"> auto-load="true">
@ -14,9 +16,9 @@
<vn-tr> <vn-tr>
<vn-th field="creationDate">Date</vn-th> <vn-th field="creationDate">Date</vn-th>
<vn-th field="userFk" shrink>User</vn-th> <vn-th field="userFk" shrink>User</vn-th>
<vn-th field="changedModel">Model</vn-th> <vn-th field="changedModel" ng-if="$ctrl.showModelName">Model</vn-th>
<vn-th field="action" shrink>Action</vn-th> <vn-th field="action" shrink>Action</vn-th>
<vn-th field="changedModelValue">Name</vn-th> <vn-th field="changedModelValue" ng-if="$ctrl.showModelName">Name</vn-th>
<vn-th expand>Changes</vn-th> <vn-th expand>Changes</vn-th>
</vn-tr> </vn-tr>
</vn-thead> </vn-thead>
@ -31,13 +33,13 @@
translate>{{::log.user.name || 'System' | translate}} translate>{{::log.user.name || 'System' | translate}}
</span> </span>
</vn-td> </vn-td>
<vn-td> <vn-td ng-if="$ctrl.showModelName">
{{::log.changedModel}} {{::log.changedModel}}
</vn-td> </vn-td>
<vn-td translate> <vn-td translate>
{{::$ctrl.actionsText[log.action]}} {{::$ctrl.actionsText[log.action]}}
</vn-td> </vn-td>
<vn-td expand> <vn-td expand ng-if="$ctrl.showModelName">
{{::log.changedModelValue}} {{::log.changedModelValue}}
</vn-td> </vn-td>
<vn-td expand> <vn-td expand>

6
front/salix/components/log/index.js
View File

@ -57,6 +57,10 @@ export default class Controller extends Section {
} }
} }
get showModelName() {
return !(this.changedModel && this.changedModelId);
}
formatValue(value) { formatValue(value) {
if (typeof value === 'string' && validDate.test(value)) if (typeof value === 'string' && validDate.test(value))
value = new Date(value); value = new Date(value);
@ -86,6 +90,8 @@ ngModule.vnComponent('vnLog', {
bindings: { bindings: {
model: '<', model: '<',
originId: '<', originId: '<',
changedModel: '<?',
changedModelId: '<?',
url: '@' url: '@'
} }
}); });