diff --git a/js/components/forms/requests_list.js b/js/components/forms/requests_list.js index abc40852..51f1afa7 100644 --- a/js/components/forms/requests_list.js +++ b/js/components/forms/requests_list.js @@ -37,18 +37,25 @@ export default { computed: { filteredRequests: function () { - return this.applySearch(this.searchValue) + return this.applyFilters(this.applySearch(this.requests, this.searchValue), this.statusValue) } }, methods: { - applySearch: function(query) { - return this.requests.filter( + applySearch: (requests, query) => { + return requests.filter( (request) => query !== '' ? request.name.toLowerCase().includes(query.toLowerCase()) : true ) }, + applyFilters: (requests, status) => { + return requests.filter( + (request) => status !== '' ? + request.simple_status.toLowerCase() === status : + true + ) + }, dollars: (value) => formatDollars(value, false), }, } diff --git a/templates/requests/index.html b/templates/requests/index.html index 8c8aa472..73fe6810 100644 --- a/templates/requests/index.html +++ b/templates/requests/index.html @@ -79,8 +79,8 @@ {% if extended_view %}