Merge branch '2059-zone_index_searchPanel' of verdnatura/salix into dev

modules/agency/back/models/agency-mode.json

@@ -20,7 +20,7 @@
         "description": {
             "type": "string"
         },
-    "deliveryMethodFk":{
+        "deliveryMethodFk": {
             "type": "number"
         },
         "m3": {
@@ -32,7 +32,7 @@
         "reportMail": {
             "type": "string"
         },
-    "isActive":{
+        "isActive": {
             "type": "boolean"
         },
         "code": {
@@ -65,9 +65,13 @@
             "permission": "ALLOW"
         }
     ],
-  "scopes" : {
-    "isActive" : {
-      "where": {"isActive": {"neq": false}}
+    "scopes": {
+        "isActive": {
+            "where": {
+                "isActive": {
+                    "neq": false
+                }
+            }
         }
     }
 }

modules/agency/front/search-panel/index.html

@@ -22,6 +22,7 @@
                 label="Agency"
                 ng-model="filter.agencyModeFk"
                 url="AgencyModes/isActive"
+                where="{deliveryMethodFk: {neq: null}}"
                 value-field="id"
                 show-field="name">
             </vn-autocomplete>