Merge branch 'test' into dev

modules/client/back/models/sample.json

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

modules/client/front/index/index.html

@@ -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>

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">