From d174d7b15ba477a664235571aa63ac8bf25c4f60 Mon Sep 17 00:00:00 2001 From: joan Date: Fri, 13 Nov 2020 07:38:18 +0100 Subject: [PATCH] Contextmenu filter hotfix --- front/core/components/contextmenu/index.js | 6 ++++-- modules/ticket/front/index/index.js | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/front/core/components/contextmenu/index.js b/front/core/components/contextmenu/index.js index db74848a6..add5a8b66 100755 --- a/front/core/components/contextmenu/index.js +++ b/front/core/components/contextmenu/index.js @@ -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); diff --git a/modules/ticket/front/index/index.js b/modules/ticket/front/index/index.js index cae9c403c..8b1ca2dfd 100644 --- a/modules/ticket/front/index/index.js +++ b/modules/ticket/front/index/index.js @@ -135,6 +135,7 @@ export default class Controller extends Section { }; case 'id': case 'refFk': + case 'zoneFk': case 'nickname': case 'agencyModeFk': case 'warehouseFk':