Merge branch 'test' into dev

This commit is contained in:
Joan Sanchez 2019-03-01 07:30:30 +01:00
commit dbc582a410
3 changed files with 10 additions and 8 deletions

View File

@ -2,9 +2,9 @@
"name": "Sample",
"base": "VnModel",
"options": {
"mysql": {
"table": "sample"
}
"mysql": {
"table": "sample"
}
},
"properties": {
"id": {
@ -19,14 +19,16 @@
"type": "String"
},
"isVisible": {
"type": "Number"
"type": "Boolean"
},
"hasCompany": {
"type": "Number"
}
},
"scope": {
"where": {"isVisible": 1}
"scopes": {
"visible": {
"where": {"isVisible": true}
}
},
"acls": [
{

View File

@ -40,7 +40,7 @@
</vn-one>
<vn-horizontal class="buttons">
<vn-icon-button
ng-click="$ctrl.preview($event)"
ng-click="$ctrl.openSummary(client, $event)"
vn-tooltip="Preview"
icon="desktop_windows">
</vn-icon-button>

View File

@ -14,7 +14,7 @@
field="$ctrl.clientSample.typeFk"
model="ClientSample.typeFk"
fields="['code','hasCompany']"
url="/client/api/Samples"
url="/client/api/Samples/visible"
show-field="description"
value-field="id"
label="Sample">