From: Galen Charlton Date: Tue, 6 Apr 2021 20:53:14 +0000 (-0400) Subject: LP#1904244: combobox: include org unit in label for funds X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=0ad6bb172d92e3a194f0edc66b78430cb41d2ec1;p=Evergreen.git LP#1904244: combobox: include org unit in label for funds 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.html b/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.html index d2280811e3..0e5253b9f6 100644 --- a/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.html +++ b/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.html @@ -5,7 +5,7 @@ - {{r.fm.code()}} ({{r.fm.year()}}) + {{r.fm.code()}} ({{r.fm.year()}}) ({{getOrgShortname(r.fm.org())}}) {{r.fm.name()}} ({{getOrgShortname(r.fm.owning_lib())}}) 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..96c15fae46 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 @@ -205,7 +205,8 @@ export class ComboboxComponent implements ControlValueAccessor, OnInit, AfterVie return fm.course_number() + ': ' + fm.name(); break; case 'acqf': - return fm.code() + ' (' + fm.year() + ')'; + return fm.code() + ' (' + fm.year() + ')' + + ' (' + this.getOrgShortname(fm.org()) + ')'; break; case 'acpl': return fm.name() + ' (' + this.getOrgShortname(fm.owning_lib()) + ')';