From 935535bb17a25d9cc862137a0fea58bfd59352f4 Mon Sep 17 00:00:00 2001
From: Mike Rylander <mrylander@gmail.com>
Date: Tue, 8 Nov 2011 12:43:44 -0500
Subject: [PATCH] Protect against slony replication lag, LP#621448
Make open-ils.circ.captured_holds.id_list.* API calls authoritative within
the staff client to avoid replication-lag related stale displays. Inspired
by James Fournie at SITKA.
Signed-off-by: Mike Rylander <mrylander@gmail.com>
---
Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm | 3 +++
Open-ILS/xul/staff_client/chrome/content/main/constants.js | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
index 8a0674ad27..9ed7f49c04 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
@@ -1863,6 +1863,7 @@ __PACKAGE__->register_method(
method => 'fetch_captured_holds',
api_name => 'open-ils.circ.captured_holds.on_shelf.retrieve',
stream => 1,
+ authoritative => 1,
signature => q/
Returns a list of un-fulfilled holds (on the Holds Shelf) for a given title id
@param authtoken The login session key
@@ -1874,6 +1875,7 @@ __PACKAGE__->register_method(
method => 'fetch_captured_holds',
api_name => 'open-ils.circ.captured_holds.id_list.on_shelf.retrieve',
stream => 1,
+ authoritative => 1,
signature => q/
Returns list ids of un-fulfilled holds (on the Holds Shelf) for a given title id
@param authtoken The login session key
@@ -1885,6 +1887,7 @@ __PACKAGE__->register_method(
method => 'fetch_captured_holds',
api_name => 'open-ils.circ.captured_holds.id_list.expired_on_shelf.retrieve',
stream => 1,
+ authoritative => 1,
signature => q/
Returns list ids of shelf-expired un-fulfilled holds for a given title id
@param authtoken The login session key
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 31142e744c..1de4e6c664 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/constants.js
+++ b/Open-ILS/xul/staff_client/chrome/content/main/constants.js
@@ -144,8 +144,8 @@ var api = {
'FM_AHR_ID_LIST_PULL_LIST' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.hold_pull_list.id_list.retrieve', 'secure' : false },
'HTML_HOLD_PULL_LIST' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.hold_pull_list.print' },
'FM_AHR_ONSHELF_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.captured_holds.on_shelf.retrieve' },
- 'FM_AHR_ID_LIST_ONSHELF_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.captured_holds.id_list.on_shelf.retrieve', 'secure' : false },
- 'FM_AHR_ID_LIST_EXPIRED_ONSHELF_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.captured_holds.id_list.expired_on_shelf.retrieve', 'secure' : false },
+ 'FM_AHR_ID_LIST_ONSHELF_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.captured_holds.id_list.on_shelf.retrieve.authoritative', 'secure' : false },
+ 'FM_AHR_ID_LIST_EXPIRED_ONSHELF_RETRIEVE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.captured_holds.id_list.expired_on_shelf.retrieve.authoritative', 'secure' : false },
'FM_AHR_COUNT_FOR_BRE' : { 'app' : 'open-ils.circ', 'method' : 'open-ils.circ.bre.holds.count', 'secure' : false },
'FM_AHR_COUNT_RETRIEVE' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.hold_requests.count', 'cacheable' : true, 'ttl' : 60000 },
'FM_AHR_COUNT_RETRIEVE.authoritative' : { 'app' : 'open-ils.actor', 'method' : 'open-ils.actor.user.hold_requests.count.authoritative', 'cacheable' : true, 'ttl' : 60000 },
--
2.11.0