verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 58 Releases Wiki Activity

Merge branch '2059-zone_index_searchPanel' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details

This commit is contained in:
Carlos Jimenez Ruiz 2020-02-06 12:14:31 +00:00 committed by Gitea
parent 6457a9cf61 73c4e310f0
commit b6a2344e14
2 changed files with 75 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/agency/back/models/agency-mode.json
View File

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

1
modules/agency/front/search-panel/index.html
View File

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