From dfc265d8529a2d5d111e1d21d700a577644e8f52 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Thu, 19 Jul 2012 12:27:41 -0400 Subject: [PATCH] invoice search : limit to invoice provider option Signed-off-by: Bill Erickson --- Open-ILS/src/templates/acq/invoice/view.tt2 | 4 ++++ Open-ILS/web/js/ui/default/acq/invoice/view.js | 13 ++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Open-ILS/src/templates/acq/invoice/view.tt2 b/Open-ILS/src/templates/acq/invoice/view.tt2 index ba4fbb9f40..695fba72df 100644 --- a/Open-ILS/src/templates/acq/invoice/view.tt2 +++ b/Open-ILS/src/templates/acq/invoice/view.tt2 @@ -214,6 +214,10 @@ + + + [% l('Limit Resutls to Invoice Provider') %] +
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 11a214da4d..762a62178e 100644 --- a/Open-ILS/web/js/ui/default/acq/invoice/view.js +++ b/Open-ILS/web/js/ui/default/acq/invoice/view.js @@ -229,7 +229,19 @@ function performSearch() { var searchObject = termManager.buildSearchObject(); dojo.cookie('invs', base64Encode(searchObject)); dojo.cookie('invc', dojo.byId("acq-unified-conjunction").getValue()); + + // if no provider filter is applied and a provider has been selected + // for this invoice, limit lineitems to the those using the invoice provider + var provider = invoicePane.getFieldValue('provider'); + if (provider && dojo.byId('acq-invoice-search-limit-provider').checked) { + if (!searchObject.jub) + searchObject.jub = []; + if (!searchObject.jub.filter(function(i) { return i.provider != null }).length) + searchObject.jub.push({provider : provider}); + } + resultManager.go(searchObject) + console.log(js2JSON(searchObject)); } @@ -260,7 +272,6 @@ function renderUnifiedSearch() { } }; - var searchObject = dojo.cookie('invs'); if (searchObject) { // if there is a search object cookie, populate the search form -- 2.11.0