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

#1366 bug in claim-index
gitea/salix/dev This commit looks good Details

This commit is contained in:
Bernat 2019-04-24 09:10:56 +02:00
parent 94480a8189
commit b2f88872fa
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/claim/back/methods/claim/filter.js
View File

@ -99,7 +99,7 @@ module.exports = Self => {
let stmt; let stmt;
stmt = new ParameterizedSQL( stmt = new ParameterizedSQL(
`SELECT cl.id, c.name, u.nickName, cs.description, cl.created `SELECT cl.id, c.name, cl.clientFk, cl.workerFk, u.nickName, cs.description, cl.created
FROM claim cl FROM claim cl
LEFT JOIN client c ON c.id = cl.clientFk LEFT JOIN client c ON c.id = cl.clientFk
LEFT JOIN worker w ON w.id = cl.workerFk LEFT JOIN worker w ON w.id = cl.workerFk

4
modules/claim/front/index/index.html
View File

@ -35,7 +35,7 @@
ui-sref="claim.card.summary({id: claim.id})"> ui-sref="claim.card.summary({id: claim.id})">
<vn-td number>{{::claim.id}}</vn-td> <vn-td number>{{::claim.id}}</vn-td>
<vn-td expand> <vn-td expand>
<span class="link" ng-click="$ctrl.showClientDescriptor($event, claim.client.id)"> <span class="link" ng-click="$ctrl.showClientDescriptor($event, claim.clientFk)">
{{::claim.name}} {{::claim.name}}
</span> </span>
</vn-td> </vn-td>
@ -43,7 +43,7 @@
<vn-td expand> <vn-td expand>
<span <span
class="link" class="link"
ng-click="$ctrl.showWorkerDescriptor($event, claim.worker.user.id)"> ng-click="$ctrl.showWorkerDescriptor($event, claim.workerFk)">
{{::claim.nickName}} {{::claim.nickName}}
</span> </span>
</vn-td> </vn-td>