From 08650a177e64a7fc3e6a0db2aff476aa9de1eb1e Mon Sep 17 00:00:00 2001 From: Gerard Date: Thu, 28 Feb 2019 11:29:24 +0100 Subject: [PATCH 1/2] client index not being able to open summary popover fixed --- modules/client/front/index/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/client/front/index/index.html b/modules/client/front/index/index.html index aacc8ba75..da718f952 100644 --- a/modules/client/front/index/index.html +++ b/modules/client/front/index/index.html @@ -40,7 +40,7 @@ From 4fe4c7886b59fa9d10b59982509f4831c8fa4d6b Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Fri, 1 Mar 2019 07:27:29 +0100 Subject: [PATCH 2/2] fixed samples visible scope --- modules/client/back/models/sample.json | 14 ++++++++------ modules/client/front/sample/create/index.html | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/client/back/models/sample.json b/modules/client/back/models/sample.json index b4d49cdab..8993250f3 100644 --- a/modules/client/back/models/sample.json +++ b/modules/client/back/models/sample.json @@ -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": [ { diff --git a/modules/client/front/sample/create/index.html b/modules/client/front/sample/create/index.html index 6685c5bb8..e8e56ba6f 100644 --- a/modules/client/front/sample/create/index.html +++ b/modules/client/front/sample/create/index.html @@ -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">