LP#1904244: combobox: include org unit in label for funds

Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
Signed-off-by: Ruth Frasur <rfrasur@library.in.gov>
Signed-off-by: Bill Erickson <berickxx@gmail.com>

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 d228081..0e5253b 100644 (file)
--- 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 @@
 </ng-template>
 
 <ng-template #acqfTemplate egIdlClass="acqf" let-r="result">
-  {{r.fm.code()}} ({{r.fm.year()}})
+  {{r.fm.code()}} ({{r.fm.year()}}) ({{getOrgShortname(r.fm.org())}})
 </ng-template>
 <ng-template #acplTemplate egIdlClass="acpl" let-r="result">
   {{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 d21ad5f..96c15fa 100644 (file)
--- 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()) + ')';