From 737ab4a5777af332e8253ed826fafafa05369579 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Tue, 8 Jun 2021 16:57:25 -0400 Subject: [PATCH] LP1901930 SIP accout list more filterable Signed-off-by: Bill Erickson --- .../app/staff/admin/server/sip/account-list.component.ts | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/sip/account-list.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/server/sip/account-list.component.ts index dcf204edeb..2bf33a5935 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/server/sip/account-list.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/server/sip/account-list.component.ts @@ -37,12 +37,20 @@ export class SipAccountListComponent implements OnInit { fetchAccounts(pager: Pager, sort: any[]): Observable { - const orderBy: any = {sisacc: 'sip_username'}; + const orderBy: any = {sipacc: 'sip_username'}; if (sort.length) { - orderBy.sisacc = sort[0].name + ' ' + sort[0].dir; + orderBy.sipacc = sort[0].name + ' ' + sort[0].dir; } - return this.pcrud.retrieveAll('sipacc', { + const query = [{id: {'!=': null}}]; + + Object.keys(this.gridSource.filters).forEach(key => { + Object.keys(this.gridSource.filters[key]).forEach(key2 => { + query.push(this.gridSource.filters[key][key2]); + }); + }); + + return this.pcrud.search('sipacc', query, { offset: pager.offset, limit: pager.limit, order_by: orderBy, -- 2.11.0