Merge branch 'test' into dev
This commit is contained in:
commit
dbc582a410
|
@ -19,14 +19,16 @@
|
||||||
"type": "String"
|
"type": "String"
|
||||||
},
|
},
|
||||||
"isVisible": {
|
"isVisible": {
|
||||||
"type": "Number"
|
"type": "Boolean"
|
||||||
},
|
},
|
||||||
"hasCompany": {
|
"hasCompany": {
|
||||||
"type": "Number"
|
"type": "Number"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"scope": {
|
"scopes": {
|
||||||
"where": {"isVisible": 1}
|
"visible": {
|
||||||
|
"where": {"isVisible": true}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"acls": [
|
"acls": [
|
||||||
{
|
{
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
</vn-one>
|
</vn-one>
|
||||||
<vn-horizontal class="buttons">
|
<vn-horizontal class="buttons">
|
||||||
<vn-icon-button
|
<vn-icon-button
|
||||||
ng-click="$ctrl.preview($event)"
|
ng-click="$ctrl.openSummary(client, $event)"
|
||||||
vn-tooltip="Preview"
|
vn-tooltip="Preview"
|
||||||
icon="desktop_windows">
|
icon="desktop_windows">
|
||||||
</vn-icon-button>
|
</vn-icon-button>
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
field="$ctrl.clientSample.typeFk"
|
field="$ctrl.clientSample.typeFk"
|
||||||
model="ClientSample.typeFk"
|
model="ClientSample.typeFk"
|
||||||
fields="['code','hasCompany']"
|
fields="['code','hasCompany']"
|
||||||
url="/client/api/Samples"
|
url="/client/api/Samples/visible"
|
||||||
show-field="description"
|
show-field="description"
|
||||||
value-field="id"
|
value-field="id"
|
||||||
label="Sample">
|
label="Sample">
|
||||||
|
|
Loading…
Reference in New Issue