verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

Merge pull request '6643-fixTicketStates' (!1914) from 6643-fixTicketStates into test
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #1914
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
This commit is contained in:
Jorge Penadés 2024-01-08 08:35:17 +00:00
parent 37a13414d1 547ac44e9b
commit dd57627094
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/ticket/front/tracking/index/index.html
View File

@ -22,9 +22,9 @@
<vn-tr ng-repeat="tracking in trackings"> <vn-tr ng-repeat="tracking in trackings">
<vn-td>{{::tracking.state.name}}</vn-td> <vn-td>{{::tracking.state.name}}</vn-td>
<vn-td expand> <vn-td expand>
<span <span
ng-class="{'link': tracking.user.id}" ng-class="{'link': tracking.user.worker}"
ng-click="workerDescriptor.show($event, tracking.user.id)"> ng-click="tracking.user.worker && workerDescriptor.show($event, tracking.user.worker.id)">
{{::tracking.user.name || 'System' | translate}} {{::tracking.user.name || 'System' | translate}}
</span> </span>
</vn-td> </vn-td>

8
modules/ticket/front/tracking/index/index.js
View File

@ -9,7 +9,13 @@ class Controller extends Section {
{ {
relation: 'user', relation: 'user',
scope: { scope: {
fields: ['name'] fields: ['id', 'name'],
include: {
relation: 'worker',
scope: {
fields: ['id']
}
}
} }
}, { }, {
relation: 'state', relation: 'state',