Merge pull request 'route.tickets suggested tickets now shows both descriptors' (#648) from 2933-route_tickets_new_ticket_to_route into dev
gitea/salix/pipeline/head This commit looks good Details

Reviewed-on: #648
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
This commit is contained in:
Joan Sanchez 2021-06-14 09:40:48 +00:00
commit 9547879f1b
1 changed files with 12 additions and 4 deletions

View File

@ -149,11 +149,13 @@
ng-model="ticket.checked"> ng-model="ticket.checked">
</vn-check> </vn-check>
</vn-td> </vn-td>
<vn-td number>{{::ticket.id}}</vn-td>
<vn-td number> <vn-td number>
<span <span class="link" ng-click="ticketDescriptor.show($event, ticket.id)">
ng-click="::$ctrl.showClientDescriptor($event, ticket.clientFk)" {{::ticket.id}}
class="link"> </span>
</vn-td>
<vn-td number>
<span class="link" ng-click="clientDescriptor.show($event, ticket.clientFk)">
{{::ticket.nickname}} {{::ticket.nickname}}
</span> </span>
</vn-td> </vn-td>
@ -180,3 +182,9 @@
vn-bind="+" vn-bind="+"
fixed-bottom-right> fixed-bottom-right>
</vn-float-button> </vn-float-button>
<vn-ticket-descriptor-popover
vn-id="ticket-descriptor">
</vn-ticket-descriptor-popover>
<vn-client-descriptor-popover
vn-id="client-descriptor">
</vn-client-descriptor-popover>