[open-ils-commits] [GIT] Evergreen ILS branch rel_2_12 updated. 938bff33e66717babb6ad2861d3dac3e8e22aa45
Evergreen Git
git at git.evergreen-ils.org
Tue Aug 8 11:00:15 EDT 2017
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_12 has been updated
via 938bff33e66717babb6ad2861d3dac3e8e22aa45 (commit)
via 26a0592044039e9ae409f1bb378ebe0d154b55d3 (commit)
from 3eb759100eb4bd5f0342f31fba3ad365383b5310 (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 938bff33e66717babb6ad2861d3dac3e8e22aa45
Author: Bill Erickson <berickxx at gmail.com>
Date: Fri Aug 4 11:54:15 2017 -0400
LP#1463166 Apply funds from view/place orders and search
Activate the copy-specific fund selectors for lineitems accessed from
the View/Place orders and MARC Federated Search interfaces. Prior to
this, fund selectors existed, but could not accept values until after a
PO was created for a given lineitem.
Signed-off-by: Bill Erickson <berickxx at gmail.com>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/web/js/ui/default/acq/common/li_table.js b/Open-ILS/web/js/ui/default/acq/common/li_table.js
index 0712093..7c19fef 100644
--- a/Open-ILS/web/js/ui/default/acq/common/li_table.js
+++ b/Open-ILS/web/js/ui/default/acq/common/li_table.js
@@ -197,9 +197,13 @@ function AcqLiTable() {
/* This is the "new" batch updater that sits atop all lineitems. It does
* use this.afwCopyFieldArgs() to borrow a little common code from the
- * "old" batch updater atop the copy details view. */
- this.initBatchUpdater = function(disabled_fields) {
- openils.Util.show("acq-batch-update", "table");
+ * "old" batch updater atop the copy details view.
+ * @param hidden allows the batch updater to be initialized, activating
+ * fund selectors, while stying invisible for UI's where the batch
+ * updater is not fully integrated.
+ * */
+ this.initBatchUpdater = function(disabled_fields, hidden) {
+ if (!hidden) openils.Util.show("acq-batch-update", "table");
if (!dojo.isArray(disabled_fields)) disabled_fields = [];
diff --git a/Open-ILS/web/js/ui/default/acq/lineitem/related.js b/Open-ILS/web/js/ui/default/acq/lineitem/related.js
index 9ae3c5f..c2ee738 100644
--- a/Open-ILS/web/js/ui/default/acq/lineitem/related.js
+++ b/Open-ILS/web/js/ui/default/acq/lineitem/related.js
@@ -147,6 +147,10 @@ function load() {
liTable.reset();
liTable._isRelatedViewer = true;
+ // render the batch updater to activate fund selection, but leave
+ // it hidden for now since it's not fully functional in this UI.
+ liTable.initBatchUpdater(null, true);
+
prepareButtons();
fetchRelated();
diff --git a/Open-ILS/web/js/ui/default/acq/picklist/bib_search.js b/Open-ILS/web/js/ui/default/acq/picklist/bib_search.js
index f0fa454..46a4180 100644
--- a/Open-ILS/web/js/ui/default/acq/picklist/bib_search.js
+++ b/Open-ILS/web/js/ui/default/acq/picklist/bib_search.js
@@ -28,6 +28,10 @@ function drawForm() {
liTable.enableActionsDropdownOptions("fs");
liTable.skipInitialEligibilityCheck = true;
+ // render the batch updater to activate fund selection, but leave
+ // it hidden for now since it's not fully functional in this UI.
+ liTable.initBatchUpdater(null, true);
+
fieldmapper.standardRequest(
['open-ils.search', 'open-ils.search.z3950.retrieve_services'],
{ async: true,
commit 26a0592044039e9ae409f1bb378ebe0d154b55d3
Author: Liam Whalen <liam.whalen at bc.libraries.coop>
Date: Fri Sep 18 20:24:14 2015 -0700
LP#1463166 Fix Batch update of Funds in Selection Lists
Selection lists are currently unable to batch update funds. The problem
stems from the fact that the Fund selection list is not populated in the
copy rows. New code used to limit the number of funds, in the dropdown
list, to those funds available to the user was added for purchase
orders. However, these changes were not added to Selection Lists. This
code adds the new call to initBatchUpdater to the selection list code.
Signed-off-by: Liam Whalen <liam.whalen at bc.libraries.coop>
Signed-off-by: Bill Erickson <berickxx at gmail.com>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/web/js/ui/default/acq/common/li_table.js b/Open-ILS/web/js/ui/default/acq/common/li_table.js
index 44e7b97..0712093 100644
--- a/Open-ILS/web/js/ui/default/acq/common/li_table.js
+++ b/Open-ILS/web/js/ui/default/acq/common/li_table.js
@@ -168,7 +168,7 @@ function AcqLiTable() {
this.setFundSearchFilter = function(callback) {
new openils.User().getPermOrgList(
- ['CREATE_PURCHASE_ORDER', 'MANAGE_FUND'],
+ ['CREATE_PURCHASE_ORDER', 'CREATE_PICKLIST', 'MANAGE_FUND'],
function(orgs) {
fundSearchFilter.org = orgs;
if (callback) callback();
@@ -272,12 +272,12 @@ function AcqLiTable() {
dojo.forEach(
["owning_lib","location","collection_code","circ_modifier","fund"],
function(field) {
- var args = self.afwCopyFieldArgs(field,"CREATE_PURCHASE_ORDER");
+ var args = self.afwCopyFieldArgs(field, "CREATE_PURCHASE_ORDER");
args.parentNode = dojo.byId("acq-bu-" + field);
if (field == 'fund') {
// The list of funds can be huge. Before fetching
- // funds for PO modification, see where the user has
+ // funds for PO or Selection LIst modification, see where the user has
// perms and limit the retreived funds accordingly.
// Note: This is the first instance of fund list
// retrieval. All future fund list retrievals will
diff --git a/Open-ILS/web/js/ui/default/acq/picklist/view.js b/Open-ILS/web/js/ui/default/acq/picklist/view.js
index 05bf842..616eb92 100644
--- a/Open-ILS/web/js/ui/default/acq/picklist/view.js
+++ b/Open-ILS/web/js/ui/default/acq/picklist/view.js
@@ -14,6 +14,7 @@ var liTable;
function load() {
liTable = new AcqLiTable();
liTable.isPL = plId;
+ liTable.initBatchUpdater();
liTable.enableActionsDropdownOptions("pl");
fieldmapper.standardRequest(
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/web/js/ui/default/acq/common/li_table.js | 16 ++++++++++------
Open-ILS/web/js/ui/default/acq/lineitem/related.js | 4 ++++
.../web/js/ui/default/acq/picklist/bib_search.js | 4 ++++
Open-ILS/web/js/ui/default/acq/picklist/view.js | 1 +
4 files changed, 19 insertions(+), 6 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list