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

Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test

This commit is contained in:
Juan Ferrer 2020-11-13 10:33:38 +01:00
parent cdf6cb661f 2680ad2c07
commit c20abad1ba
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() { removeFilter() {
const userFilter = this.model.userFilter; const userFilter = this.model.userFilter;
const userParams = this.model.userParams; const userParams = this.model.userParams;
const where = userFilter.where; const where = userFilter && userFilter.where;
let filterKey = this.fieldName; let filterKey = this.fieldName;
if (this.exprBuilder) { if (this.exprBuilder) {
@ -173,9 +173,11 @@ export default class Contextmenu {
param: filterKey, param: filterKey,
value: null value: null
}); });
[filterKey] = Object.keys(param); if (param) [filterKey] = Object.keys(param);
} }
if (!where) return;
const whereKeys = Object.keys(where); const whereKeys = Object.keys(where);
for (let key of whereKeys) for (let key of whereKeys)
removeProp(where, filterKey, key); 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 'id':
case 'refFk': case 'refFk':
case 'zoneFk':
case 'nickname': case 'nickname':
case 'agencyModeFk': case 'agencyModeFk':
case 'warehouseFk': case 'warehouseFk':