[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch rel_2_6 updated. dc1dc75cc0766e09ffeb2618d6560619ca891d3b

[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, rel_2_6 has been updated
       via  dc1dc75cc0766e09ffeb2618d6560619ca891d3b (commit)
      from  985b6d8e1c4872f017b08e64e22b2f3cbf2583ef (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 dc1dc75cc0766e09ffeb2618d6560619ca891d3b
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Thu Oct 23 12:17:58 2014 -0700

    LP#1384868: limit fund drop-downs on the invoice page to only active funds
    
    This patch fixes the fund selectors for adding extra copies
    and charges to invoices to only active funds (in addition
    to the existing restriction to funds visible to the user).
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Bill Erickson <berickxx at gmail.com>

diff --git a/Open-ILS/web/js/ui/default/acq/invoice/view.js b/Open-ILS/web/js/ui/default/acq/invoice/view.js
index 3d42e43..d5cf6f1 100644
--- a/Open-ILS/web/js/ui/default/acq/invoice/view.js
+++ b/Open-ILS/web/js/ui/default/acq/invoice/view.js
@@ -20,7 +20,7 @@ var localeStrings = dojo.i18n.getLocalization('openils.acq', 'acq');
 
 var fundLabelFormat = ['${0} (${1})', 'code', 'year'];
 var fundSearchFormat = ['${0} (${1})', 'code', 'year'];
-var fundSearchFilter = {}; 
+var fundSearchFilter = {active : 't'};
 
 var cgi = new openils.CGI();
 var pcrud = new openils.PermaCrud();
@@ -112,7 +112,6 @@ function init2() {
     extraCopiesFund = new openils.widget.AutoFieldWidget({
         fmField : 'fund',
         fmClass : 'acqlid',
-        searchFilter : {active : 't'},
         labelFormat : fundLabelFormat,
         searchFormat : fundSearchFormat,
         searchFilter : fundSearchFilter,
@@ -635,9 +634,8 @@ function addInvoiceItem(item) {
     }
 
     if(item.fund_debit()) {
-        fundArgs.searchFilter = {'-or' : [{active : 't'}, {id : item.fund()}]};
+        fundArgs.searchFilter = {'-or' : [{ "-and": fundSearchFilter }, {id : item.fund()}]};
     } else {
-        fundArgs.searchFilter = {active : 't'}
         if(itemType && openils.Util.isTrue(itemType.prorate()))
             fundArgs.dijitArgs = {disabled : true};
     }

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

Summary of changes:
 Open-ILS/web/js/ui/default/acq/invoice/view.js |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS