From: Galen Charlton Date: Fri, 4 Dec 2020 16:17:51 +0000 (-0500) Subject: LP#1916949: combobox: asyncSupportsEmptyTermClick fix X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=29861c5239508472da6b051947aa53b310b06744;p=evergreen%2Fpines.git LP#1916949: combobox: asyncSupportsEmptyTermClick fix This is a backport of a patch that was included as part of LP#1904244. Fixes situation where combobox would fetch the needed entries in async mode, but fail to open the drop-down. This includes code originally written by Bill Erickson with additions by Galen Charlton to insure that static data sources would continue to work. Signed-off-by: Galen Charlton Signed-off-by: Ruth Frasur Signed-off-by: Bill Erickson --- diff --git a/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts b/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts index d21ad5f916..cf9b46a769 100644 --- a/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts +++ b/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts @@ -457,7 +457,7 @@ export class ComboboxComponent implements ControlValueAccessor, OnInit, AfterVie (entry: ComboboxEntry) => this.addAsyncEntry(entry), err => {}, () => { - observer.next(searchTerm); + observer.next(term); observer.complete(); } ); @@ -487,9 +487,13 @@ export class ComboboxComponent implements ControlValueAccessor, OnInit, AfterVie // click action occurred. if (term === '') { return []; } - // In sync-data mode, a click displays the full list. - if (term === '_CLICK_' && !this.asyncDataSource) { - return this.entrylist; + // Clicking always displays the full list. + if (term === '_CLICK_') { + if (this.asyncDataSource) { + term = ''; + } else { + return this.entrylist; + } } // Filter entrylist whose labels substring-match the