From 7a562787d73a0c1b119dc49a9d666c041ca4327e Mon Sep 17 00:00:00 2001 From: Tiffany Little Date: Fri, 18 Jan 2019 15:54:27 -0500 Subject: [PATCH] LP#1329920 Add fund year to distribution formula fund dropdown menu In distribution formulas, adds the fund year in parentheses to the funds listed in the Fund drop-down menu. Signed-off-by: Tiffany Little Signed-off-by: Kyle Huckins Signed-off-by: Galen Charlton --- .../js/ui/default/conify/global/acq/distribution_formula.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Open-ILS/web/js/ui/default/conify/global/acq/distribution_formula.js b/Open-ILS/web/js/ui/default/conify/global/acq/distribution_formula.js index 41bac335de..2a44917790 100644 --- a/Open-ILS/web/js/ui/default/conify/global/acq/distribution_formula.js +++ b/Open-ILS/web/js/ui/default/conify/global/acq/distribution_formula.js @@ -15,6 +15,8 @@ var pcrud; var _collection_code_textboxes = []; var _collection_code_kludge_active = false; var fundSearchFilter = {active : 't'}; +var fundLabelFormat = ['${0} (${1})', 'code', 'year']; + function gridDataLoader() { fListGrid.resetStore(); @@ -165,6 +167,7 @@ function addEntry(entry) { fmField : field, fmObject : entry, fmClass : 'acqdfe', + labelFormat: (field == 'fund') ? fundLabelFormat : null, searchFilter : (field == 'fund') ? fundSearchFilter : null, parentNode : byName(row, field), orgDefaultsToWs : true, -- 2.43.2