From aa79d74f3bfafc17c2d63618ec5e1112cf7af0fd Mon Sep 17 00:00:00 2001 From: Elsio Sanchez <45974454+elsiosanchez@users.noreply.github.com> Date: Thu, 25 Feb 2021 22:21:45 -0400 Subject: [PATCH] fix search recient Items and Document tasks (#607) --- src/components/ADempiere/Dashboard/docstatus/index.vue | 2 +- src/components/ADempiere/Dashboard/mixinDashboard.js | 8 ++------ src/components/ADempiere/Dashboard/recentItems/index.vue | 2 +- .../ADempiere/Dashboard/userfavorites/index.vue | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/components/ADempiere/Dashboard/docstatus/index.vue b/src/components/ADempiere/Dashboard/docstatus/index.vue index a9bc27e7..25105597 100644 --- a/src/components/ADempiere/Dashboard/docstatus/index.vue +++ b/src/components/ADempiere/Dashboard/docstatus/index.vue @@ -41,7 +41,7 @@ export default { computed: { dataResult() { if (this.search.length) { - return this.filterResult(this.search) + return this.filterResult(this.search, this.documents) } return this.documents } diff --git a/src/components/ADempiere/Dashboard/mixinDashboard.js b/src/components/ADempiere/Dashboard/mixinDashboard.js index 4eeef55d..7ebd33ba 100644 --- a/src/components/ADempiere/Dashboard/mixinDashboard.js +++ b/src/components/ADempiere/Dashboard/mixinDashboard.js @@ -55,13 +55,9 @@ export default { } // conditions for the registration amount (operador: row.criteria.whereClause) }, - filterResult(search) { + filterResult(search, list) { const searchFilter = this.ignoreAccent(search.toLowerCase()) - return this.documents.filter(item => { - return this.ignoreAccent(item.name) - .toLowerCase() - .includes(searchFilter) - }) + return list.filter(data => !searchFilter || data.name.toLowerCase().includes(searchFilter.toLowerCase())) }, ignoreAccent(s) { if (!s) { diff --git a/src/components/ADempiere/Dashboard/recentItems/index.vue b/src/components/ADempiere/Dashboard/recentItems/index.vue index a188371a..0b5325db 100644 --- a/src/components/ADempiere/Dashboard/recentItems/index.vue +++ b/src/components/ADempiere/Dashboard/recentItems/index.vue @@ -53,7 +53,7 @@ export default { computed: { dataResult() { if (this.search.length) { - return this.filterResult(this.search) + return this.filterResult(this.search, this.recentItems) } return this.recentItems }, diff --git a/src/components/ADempiere/Dashboard/userfavorites/index.vue b/src/components/ADempiere/Dashboard/userfavorites/index.vue index 0d7002c3..1ee92281 100644 --- a/src/components/ADempiere/Dashboard/userfavorites/index.vue +++ b/src/components/ADempiere/Dashboard/userfavorites/index.vue @@ -70,7 +70,7 @@ export default { computed: { dataResult() { if (this.search.length) { - return this.filterResult(this.search) + return this.filterResult(this.search, this.favorites) } return this.favorites }