From 2b6255aa1106691dc365fcecf8b22e91c6dfbf23 Mon Sep 17 00:00:00 2001 From: gmc Date: Fri, 5 Nov 2010 17:56:01 +0000 Subject: [PATCH] switch to authoritative methods for various acq retrievals Avoid race condition when using Slony replication Signed-off-by: Galen Charlton git-svn-id: svn://svn.open-ils.org/ILS/trunk@18637 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/js/dojo/openils/acq/Lineitem.js | 2 +- Open-ILS/web/js/dojo/openils/acq/Picklist.js | 2 +- Open-ILS/web/js/ui/default/acq/common/li_table.js | 2 +- Open-ILS/web/js/ui/default/acq/invoice/view.js | 2 +- Open-ILS/web/js/ui/default/acq/lineitem/related.js | 2 +- Open-ILS/web/js/ui/default/acq/picklist/brief_record.js | 2 +- Open-ILS/web/js/ui/default/acq/picklist/user_request.js | 2 +- Open-ILS/web/js/ui/default/acq/picklist/view.js | 2 +- Open-ILS/web/js/ui/default/acq/picklist/view_list.js | 2 +- Open-ILS/web/js/ui/default/acq/search/picklist.js | 2 +- Open-ILS/xul/staff_client/server/circ/util.js | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Open-ILS/web/js/dojo/openils/acq/Lineitem.js b/Open-ILS/web/js/dojo/openils/acq/Lineitem.js index 27ed9e3fdf..7c08653c1a 100644 --- a/Open-ILS/web/js/dojo/openils/acq/Lineitem.js +++ b/Open-ILS/web/js/dojo/openils/acq/Lineitem.js @@ -119,7 +119,7 @@ openils.acq.Lineitem.fetchAndRender = function(liId, args, callback) { }); fieldmapper.standardRequest( - ['open-ils.acq', 'open-ils.acq.lineitem.retrieve'], + ['open-ils.acq', 'open-ils.acq.lineitem.retrieve.authoritative'], { params : [ openils.User.authtoken, liId, args ], diff --git a/Open-ILS/web/js/dojo/openils/acq/Picklist.js b/Open-ILS/web/js/dojo/openils/acq/Picklist.js index 504b9691a0..d80eeb5344 100644 --- a/Open-ILS/web/js/dojo/openils/acq/Picklist.js +++ b/Open-ILS/web/js/dojo/openils/acq/Picklist.js @@ -57,7 +57,7 @@ dojo.declare('openils.acq.Picklist', null, { // // Fetch the picklist information fieldmapper.standardRequest( - ['open-ils.acq', 'open-ils.acq.picklist.retrieve'], + ['open-ils.acq', 'open-ils.acq.picklist.retrieve.authoritative'], { async: false, params: [openils.User.authtoken, pl_id, {flesh_lineitem_count:1}], oncomplete: function(r) { 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 d12d09fac0..dc8e56a3fb 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 @@ -323,7 +323,7 @@ function AcqLiTable() { this.plCache[li.picklist()] = this.plCache[li.picklist()] || fieldmapper.standardRequest( - ['open-ils.acq', 'open-ils.acq.picklist.retrieve'], + ['open-ils.acq', 'open-ils.acq.picklist.retrieve.authoritative'], {params: [this.authtoken, li.picklist()]}); if (pl) { if (pl.name() == "") { 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 102294e65c..281189f928 100644 --- a/Open-ILS/web/js/ui/default/acq/invoice/view.js +++ b/Open-ILS/web/js/ui/default/acq/invoice/view.js @@ -52,7 +52,7 @@ function init() { } else { fieldmapper.standardRequest( - ['open-ils.acq', 'open-ils.acq.invoice.retrieve'], + ['open-ils.acq', 'open-ils.acq.invoice.retrieve.authoritative'], { params : [openils.User.authtoken, invoiceId], oncomplete : function(r) { 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 e06a7161ff..e90874d94f 100644 --- a/Open-ILS/web/js/ui/default/acq/lineitem/related.js +++ b/Open-ILS/web/js/ui/default/acq/lineitem/related.js @@ -14,7 +14,7 @@ var paramPO; function fetchLi() { fieldmapper.standardRequest( - ["open-ils.acq", "open-ils.acq.lineitem.retrieve"], { + ["open-ils.acq", "open-ils.acq.lineitem.retrieve.authoritative"], { "async": true, "params": [openils.User.authtoken, targetId, { "flesh_attrs": true, diff --git a/Open-ILS/web/js/ui/default/acq/picklist/brief_record.js b/Open-ILS/web/js/ui/default/acq/picklist/brief_record.js index 17be1359aa..9653aa529b 100644 --- a/Open-ILS/web/js/ui/default/acq/picklist/brief_record.js +++ b/Open-ILS/web/js/ui/default/acq/picklist/brief_record.js @@ -30,7 +30,7 @@ function drawBriefRecordForm(fields) { openils.Util.hide('acq-brief-record-po-row'); fieldmapper.standardRequest( - ['open-ils.acq', 'open-ils.acq.picklist.retrieve'], + ['open-ils.acq', 'open-ils.acq.picklist.retrieve.authoritative'], { async: true, params: [openils.User.authtoken, paramPL], oncomplete : function(r) { diff --git a/Open-ILS/web/js/ui/default/acq/picklist/user_request.js b/Open-ILS/web/js/ui/default/acq/picklist/user_request.js index 392273bac4..cf75f521af 100644 --- a/Open-ILS/web/js/ui/default/acq/picklist/user_request.js +++ b/Open-ILS/web/js/ui/default/acq/picklist/user_request.js @@ -90,7 +90,7 @@ function fooPicklist() { function viewPicklist() { var lineitem = fieldmapper.standardRequest( - [ 'open-ils.acq', 'open-ils.acq.lineitem.retrieve' ], + [ 'open-ils.acq', 'open-ils.acq.lineitem.retrieve.authoritative' ], { params: [openils.User.authtoken, aur_obj.lineitem()] } 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 cfd6cb98d1..7cbc0c5f25 100644 --- a/Open-ILS/web/js/ui/default/acq/picklist/view.js +++ b/Open-ILS/web/js/ui/default/acq/picklist/view.js @@ -14,7 +14,7 @@ function load() { liTable = new AcqLiTable(); liTable.isPL = plId; fieldmapper.standardRequest( - ['open-ils.acq', 'open-ils.acq.picklist.retrieve'], + ['open-ils.acq', 'open-ils.acq.picklist.retrieve.authoritative'], { async: true, params: [openils.User.authtoken, plId, {flesh_lineitem_count:true, flesh_owner:true}], diff --git a/Open-ILS/web/js/ui/default/acq/picklist/view_list.js b/Open-ILS/web/js/ui/default/acq/picklist/view_list.js index fb245a8c59..17b2e92e44 100644 --- a/Open-ILS/web/js/ui/default/acq/picklist/view_list.js +++ b/Open-ILS/web/js/ui/default/acq/picklist/view_list.js @@ -68,7 +68,7 @@ function createPL(fields) { function(plId) { fieldmapper.standardRequest( - ['open-ils.acq', 'open-ils.acq.picklist.retrieve'], + ['open-ils.acq', 'open-ils.acq.picklist.retrieve.authoritative'], { async: true, params: [openils.User.authtoken, plId, {flesh_lineitem_count:1, flesh_owner:1}], diff --git a/Open-ILS/web/js/ui/default/acq/search/picklist.js b/Open-ILS/web/js/ui/default/acq/search/picklist.js index b21bc37cb8..61da13f749 100644 --- a/Open-ILS/web/js/ui/default/acq/search/picklist.js +++ b/Open-ILS/web/js/ui/default/acq/search/picklist.js @@ -165,7 +165,7 @@ function createPl(fields) { openils.acq.Picklist.create(fields, function(plId) { fieldmapper.standardRequest( - ["open-ils.acq", "open-ils.acq.picklist.retrieve"], { + ["open-ils.acq", "open-ils.acq.picklist.retrieve.authoritative"], { "async": true, "params": [ openils.User.authtoken, plId, diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js index 8cd554ae06..2405182e31 100644 --- a/Open-ILS/xul/staff_client/server/circ/util.js +++ b/Open-ILS/xul/staff_client/server/circ/util.js @@ -3402,7 +3402,7 @@ circ.util.batch_hold_update = function ( hold_ids, field_changes, params ) { circ.util.find_acq_po = function(session, copy_id) { dojo.require("openils.Util"); fieldmapper.standardRequest( - ["open-ils.acq", "open-ils.acq.lineitem.retrieve.by_copy_id"], { + ["open-ils.acq", "open-ils.acq.lineitem.retrieve.by_copy_id.authoritative"], { "params": [session, copy_id, {"clear_marc": true}], "onresponse": function(r) { if (r = openils.Util.readResponse(r)) { -- 2.11.0