From 0caabaf516d77f18b3a05686ec30979aa83c223c Mon Sep 17 00:00:00 2001 From: nathangray Date: Tue, 8 Jun 2021 13:31:32 -0600 Subject: [PATCH] Fix PUSH new entries did not show if filter had multiple values --- api/js/jsapi/egw_app.js | 6 ++++-- api/js/jsapi/egw_app.ts | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/api/js/jsapi/egw_app.js b/api/js/jsapi/egw_app.js index bbef092817..82f0e9d96a 100644 --- a/api/js/jsapi/egw_app.js +++ b/api/js/jsapi/egw_app.js @@ -263,10 +263,12 @@ var EgwApp = /** @class */ (function () { for (var _i = 0, _a = Object.values(filters); _i < _a.length; _i++) { var field_filter = _a[_i]; var val = value.col_filter[field_filter.col]; - if (val && (typeof val == "string" && val.trim().length > 0 || - typeof val == "object" && !jQuery.isEmptyObject(val))) { + if (val && (typeof val == "string" && val.trim().length > 0)) { field_filter.filter_values.push(val); } + else if (val && typeof val == "object" && !jQuery.isEmptyObject(val)) { + field_filter.filter_values = field_filter.filter_values.concat(Object.values(val)); + } } var _loop_2 = function (field_filter) { // no filter set diff --git a/api/js/jsapi/egw_app.ts b/api/js/jsapi/egw_app.ts index 791958661a..818798cd21 100644 --- a/api/js/jsapi/egw_app.ts +++ b/api/js/jsapi/egw_app.ts @@ -384,12 +384,15 @@ export abstract class EgwApp { let val = value.col_filter[field_filter.col]; if(val && ( - typeof val == "string" && val.trim().length > 0 || - typeof val == "object" && !jQuery.isEmptyObject(val) + typeof val == "string" && val.trim().length > 0 )) { field_filter.filter_values.push(val); } + else if (val && typeof val == "object" && !jQuery.isEmptyObject(val)) + { + field_filter.filter_values = field_filter.filter_values.concat(Object.values(val)) + } } // check filters against pushData.acl data