From 550a2cc7c50e2a39cc244dd9c8c621898cac36a7 Mon Sep 17 00:00:00 2001 From: pines Date: Sat, 26 Aug 2006 07:12:38 +0000 Subject: [PATCH] alternate pull list git-svn-id: svn://svn.open-ils.org/ILS/trunk@5704 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../staff_client/chrome/content/main/constants.js | 1 + Open-ILS/xul/staff_client/server/admin/index.xhtml | 3 +++ Open-ILS/xul/staff_client/server/patron/holds.js | 24 +++++++++++++--------- Open-ILS/xul/staff_client/server/patron/holds.xul | 1 + 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/Open-ILS/xul/staff_client/chrome/content/main/constants.js b/Open-ILS/xul/staff_client/chrome/content/main/constants.js index 7cb86be4a8..f4e18500d3 100644 --- a/Open-ILS/xul/staff_client/chrome/content/main/constants.js +++ b/Open-ILS/xul/staff_client/chrome/content/main/constants.js @@ -57,6 +57,7 @@ const api = { 'FM_AHR_RETRIEVE_VIA_AU' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.holds.retrieve' }, 'FM_AHR_RETRIEVE_VIA_BRE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.open_holds.retrieve' }, 'FM_AHR_RETRIEVE_VIA_PICKUP_AOU' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.holds.retrieve_by_pickup_lib' }, + 'FM_AHR_PULL_LIST' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.hold_pull_list.retrieve' }, 'FM_AHR_ONSHELF_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.captured_holds.on_shelf.retrieve' }, 'FM_AHR_COUNT_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.hold_requests.count' }, 'FM_AHR_CANCEL' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.hold.cancel' }, diff --git a/Open-ILS/xul/staff_client/server/admin/index.xhtml b/Open-ILS/xul/staff_client/server/admin/index.xhtml index 2a0ff9664d..e9e201f629 100644 --- a/Open-ILS/xul/staff_client/server/admin/index.xhtml +++ b/Open-ILS/xul/staff_client/server/admin/index.xhtml @@ -34,6 +34,9 @@ Printer Settings Editor
+ Alternate Pull List for Hold Requests +
+
Cash Reports
diff --git a/Open-ILS/xul/staff_client/server/patron/holds.js b/Open-ILS/xul/staff_client/server/patron/holds.js index 07013a1564..3f96ae5b13 100644 --- a/Open-ILS/xul/staff_client/server/patron/holds.js +++ b/Open-ILS/xul/staff_client/server/patron/holds.js @@ -566,25 +566,29 @@ patron.holds.prototype = { if (window.xulG && window.xulG.holds) { obj.holds = window.xulG.holds; } else { - var method; var id; + var method; var param1; var param2 = undefined; if (obj.patron_id) { method = 'FM_AHR_RETRIEVE_VIA_AU'; - id = obj.patron_id; + param1 = obj.patron_id; obj.controller.view.cmd_retrieve_patron.setAttribute('hidden','true'); } else if (obj.docid) { method = 'FM_AHR_RETRIEVE_VIA_BRE'; - id = obj.docid; + param1 = obj.docid; + obj.controller.view.cmd_retrieve_patron.setAttribute('hidden','false'); + } else if (obj.pull) { + method = 'FM_AHR_PULL_LIST'; + param1 = 50; param2 = 0; + } else if (obj.shelf) { + method = 'FM_AHR_ONSHELF_RETRIEVE'; + param1 = obj.data.list.au[0].ws_ou(); obj.controller.view.cmd_retrieve_patron.setAttribute('hidden','false'); } else { - if (obj.shelf) { - method = 'FM_AHR_ONSHELF_RETRIEVE'; - } else { - method = 'FM_AHR_RETRIEVE_VIA_PICKUP_AOU'; - } - id = obj.data.list.au[0].ws_ou(); + //method = 'FM_AHR_RETRIEVE_VIA_PICKUP_AOU'; + method = 'FM_AHR_PULL_LIST'; + param1 = 50; param2 = 0; obj.controller.view.cmd_retrieve_patron.setAttribute('hidden','false'); } - obj.holds = obj.network.simple_request( method, [ ses(), id ]); + obj.holds = obj.network.simple_request( method, [ ses(), param1, param2 ]); } function gen_list_append(hold) { diff --git a/Open-ILS/xul/staff_client/server/patron/holds.xul b/Open-ILS/xul/staff_client/server/patron/holds.xul index be4d13f0d1..c4c2b98563 100644 --- a/Open-ILS/xul/staff_client/server/patron/holds.xul +++ b/Open-ILS/xul/staff_client/server/patron/holds.xul @@ -49,6 +49,7 @@ 'patron_id' : g.cgi.param('patron_id'), 'docid' : g.cgi.param('docid'), 'shelf' : g.cgi.param('shelf'), + 'pull' : g.cgi.param('pull'), } ); window.refresh = function(p) { g.holds.retrieve(p); } -- 2.11.0