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

Contextmenu filter hotfix
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Joan Sanchez 2020-11-13 07:38:18 +01:00
parent 23e8d64678
commit d174d7b15b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
front/core/components/contextmenu/index.js
View File

@ -165,7 +165,7 @@ export default class Contextmenu {
removeFilter() {
const userFilter = this.model.userFilter;
const userParams = this.model.userParams;
const where = userFilter.where;
const where = userFilter && userFilter.where;
let filterKey = this.fieldName;
if (this.exprBuilder) {
@ -173,9 +173,11 @@ export default class Contextmenu {
param: filterKey,
value: null
});
[filterKey] = Object.keys(param);
if (param) [filterKey] = Object.keys(param);
}
if (!where) return;
const whereKeys = Object.keys(where);
for (let key of whereKeys)
removeProp(where, filterKey, key);

1
modules/ticket/front/index/index.js
View File

@ -135,6 +135,7 @@ export default class Controller extends Section {
};
case 'id':
case 'refFk':
case 'zoneFk':
case 'nickname':
case 'agencyModeFk':
case 'warehouseFk':