Merge branch 'dev' of http://git.verdnatura.es/salix into dev

This commit is contained in:
Carlos Jimenez 2018-08-23 09:09:54 +02:00
commit 67fdaecebd
1 changed files with 5 additions and 13 deletions

View File

@ -4,12 +4,6 @@
filter="{}" filter="{}"
data="sales" on-data-change="$ctrl.onDataChange()"> data="sales" on-data-change="$ctrl.onDataChange()">
</vn-crud-model> </vn-crud-model>
<vn-watcher
vn-id="watcher"
data="sales">
</vn-watcher>
<vn-vertical> <vn-vertical>
<vn-card pad-large> <vn-card pad-large>
<vn-vertical> <vn-vertical>
@ -53,10 +47,9 @@
<vn-table model="model"> <vn-table model="model">
<vn-thead> <vn-thead>
<vn-tr> <vn-tr>
<vn-th number> <vn-th number ng-show="$ctrl.isEditable">
<vn-multi-check <vn-multi-check
data="$ctrl.sales" data="$ctrl.sales">
disabled="!$ctrl.isEditable">
</vn-multi-check> </vn-multi-check>
</vn-th> </vn-th>
<vn-th></vn-th> <vn-th></vn-th>
@ -71,10 +64,9 @@
</vn-thead> </vn-thead>
<vn-tbody> <vn-tbody>
<vn-tr ng-repeat="sale in sales"> <vn-tr ng-repeat="sale in sales">
<vn-td number> <vn-td number ng-show="$ctrl.isEditable">
<vn-check <vn-check
field="sale.checked" field="sale.checked">
disabled="!$ctrl.isEditable">
</vn-check> </vn-check>
</vn-td> </vn-td>
<vn-td> <vn-td>
@ -140,7 +132,7 @@
</vn-empty-rows> </vn-empty-rows>
<vn-tfoot> <vn-tfoot>
<vn-tr ng-if="model.data.length > 0"> <vn-tr ng-if="model.data.length > 0">
<vn-td></vn-td> <vn-td ng-show="$ctrl.isEditable"></vn-td>
<vn-td></vn-td> <vn-td></vn-td>
<vn-td></vn-td> <vn-td></vn-td>
<vn-td></vn-td> <vn-td></vn-td>