[open-ils-commits] [GIT] Evergreen ILS branch master updated. deb85c5556cf0fbc7112b0fcec2da86b610b12d1

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  deb85c5556cf0fbc7112b0fcec2da86b610b12d1 (commit)
       via  7a562787d73a0c1b119dc49a9d666c041ca4327e (commit)
      from  69046659b9224038fc4a4f085a6a4294588e98d1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit deb85c5556cf0fbc7112b0fcec2da86b610b12d1
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Fri Aug 2 12:44:16 2019 -0400

    LP#1329920: (follow-up) set searchFormat as well
    
    AutoFieldWidget's searchFormat (among other things) controls
    the formatting of the selected value for a drop-down, so
    this patch sets it for funds as well. This patch also tidys
    up whitespace.
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

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 2a44917790..1b5b9acf77 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
@@ -17,7 +17,6 @@ var _collection_code_kludge_active = false;
 var fundSearchFilter = {active : 't'};
 var fundLabelFormat = ['${0} (${1})', 'code', 'year'];
 
-
 function gridDataLoader() {
     fListGrid.resetStore();
     fListGrid.showLoadProgressIndicator();
@@ -167,7 +166,8 @@ function addEntry(entry) {
                 fmField : field, 
                 fmObject : entry,
                 fmClass : 'acqdfe',
-		labelFormat: (field == 'fund') ? fundLabelFormat : null,
+                labelFormat: (field == 'fund') ? fundLabelFormat : null,
+                searchFormat: (field == 'fund') ? fundLabelFormat : null,
                 searchFilter : (field == 'fund') ? fundSearchFilter : null,
                 parentNode : byName(row, field),
                 orgDefaultsToWs : true,

commit 7a562787d73a0c1b119dc49a9d666c041ca4327e
Author: Tiffany Little <tlittle at georgialibraries.org>
Date:   Fri Jan 18 15:54:27 2019 -0500

    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 <tlittle at georgialibraries.org>
    Signed-off-by: Kyle Huckins <khuckins at catalyte.io>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

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,

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/web/js/ui/default/conify/global/acq/distribution_formula.js | 3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
Evergreen ILS