From ea7fc307c0fcf55f7f43808dc3bcd55cf2f0e6bd Mon Sep 17 00:00:00 2001 From: Jeff Godin Date: Thu, 15 Jun 2017 10:52:27 -0400 Subject: [PATCH] LP#1680566 Stop using open-ils.permacrud service Transition last few bits of code using open-ils.permacrud to use open-ils.pcrud. Signed-off-by: Jeff Godin Signed-off-by: Galen Charlton --- .../web/js/dojo/openils/widget/TranslatorPopup.js | 4 ++-- Open-ILS/web/js/ui/default/vandelay/vandelay.js | 24 +++++++++++----------- .../xul/staff_client/chrome/content/cat/opac.js | 10 ++++----- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Open-ILS/web/js/dojo/openils/widget/TranslatorPopup.js b/Open-ILS/web/js/dojo/openils/widget/TranslatorPopup.js index e301746d8f..6f1599c697 100644 --- a/Open-ILS/web/js/dojo/openils/widget/TranslatorPopup.js +++ b/Open-ILS/web/js/dojo/openils/widget/TranslatorPopup.js @@ -220,8 +220,8 @@ if(!dojo._hasResource["openils.widget.TranslatorPopup"]) { } } - OpenSRF.CachedClientSession('open-ils.permacrud').request({ - method : 'open-ils.permacrud.' + method + '.i18n', + OpenSRF.CachedClientSession('open-ils.pcrud').request({ + method : 'open-ils.pcrud.' + method + '.i18n', timeout: 10, params : [ ses, trans_obj ], onerror: function (r) { diff --git a/Open-ILS/web/js/ui/default/vandelay/vandelay.js b/Open-ILS/web/js/ui/default/vandelay/vandelay.js index b60cab0843..c45918ff34 100644 --- a/Open-ILS/web/js/ui/default/vandelay/vandelay.js +++ b/Open-ILS/web/js/ui/default/vandelay/vandelay.js @@ -172,7 +172,7 @@ function vlInit() { ); fieldmapper.standardRequest( - ['open-ils.permacrud', 'open-ils.permacrud.search.cbs.atomic'], + ['open-ils.pcrud', 'open-ils.pcrud.search.cbs.atomic'], { async: true, params: [authtoken, {id:{"!=":null}}, {order_by:{cbs:'id'}}], oncomplete : function(r) { @@ -285,7 +285,7 @@ openils.Util.addOnLoad(vlInit); function vlFetchBibAttrDefs(postcomplete) { bibAttrDefs = []; fieldmapper.standardRequest( - ['open-ils.permacrud', 'open-ils.permacrud.search.vqbrad'], + ['open-ils.pcrud', 'open-ils.pcrud.search.vqbrad'], { async: true, params: [authtoken, {id:{'!=':null}}], onresponse: function(r) { @@ -311,7 +311,7 @@ function vlFetchBibAttrDefs(postcomplete) { function vlFetchAuthAttrDefs(postcomplete) { authAttrDefs = []; fieldmapper.standardRequest( - ['open-ils.permacrud', 'open-ils.permacrud.search.vqarad'], + ['open-ils.pcrud', 'open-ils.pcrud.search.vqarad'], { async: true, params: [authtoken, {id:{'!=':null}}], onresponse: function(r) { @@ -1765,10 +1765,10 @@ function vlOpenMarcEditWindow(rec, postReloadHTMLHandler) { save : { label: dojo.byId('vl-marc-edit-save-label').innerHTML, func: function(xmlString) { - var method = 'open-ils.permacrud.update.' + rec.classname; + var method = 'open-ils.pcrud.update.' + rec.classname; rec.marc(xmlString); fieldmapper.standardRequest( - ['open-ils.permacrud', method], + ['open-ils.pcrud', method], { async: true, params: [authtoken, rec], oncomplete: onsave @@ -1782,12 +1782,12 @@ function vlOpenMarcEditWindow(rec, postReloadHTMLHandler) { } function vlLoadMarcEditor(type, recId, postReloadHTMLHandler) { - var method = 'open-ils.permacrud.search.vqbr'; + var method = 'open-ils.pcrud.search.vqbr'; if(currentType != 'bib') method = method.replace(/vqbr/,'vqar'); fieldmapper.standardRequest( - ['open-ils.permacrud', method], + ['open-ils.pcrud', method], { async: true, params: [authtoken, {id : recId}], oncomplete: function(r) { @@ -1909,20 +1909,20 @@ function vlSaveAttrDefinition(data) { data.xpath = _xpath; } - // build up our permacrud params. Key variables here are + // build up our pcrud params. Key variables here are // "create or update" and "bib or auth". var isAuth = (ATTR_EDIT_GROUP == 'auth'); var isCreate = (ATTR_EDIT_ID == null); var rad = isAuth ? new vqarad() : new vqbrad() ; - var method = 'open-ils.permacrud' + (isCreate ? '.create.' : '.update.') + var method = 'open-ils.pcrud' + (isCreate ? '.create.' : '.update.') + (isAuth ? 'vqarad' : 'vqbrad'); var _data = rad.fromStoreItem(data); _data.ischanged(1); fieldmapper.standardRequest( - ['open-ils.permacrud', method], + ['open-ils.pcrud', method], { async: true, params: [authtoken, _data ], onresponse: function(r) { }, @@ -1947,10 +1947,10 @@ function vlAttrDelete() { idShow('vl-generic-progress'); var isAuth = (ATTR_EDIT_GROUP == 'auth'); - var method = 'open-ils.permacrud.delete.' + (isAuth ? 'vqarad' : 'vqbrad'); + var method = 'open-ils.pcrud.delete.' + (isAuth ? 'vqarad' : 'vqbrad'); var rad = isAuth ? new vqarad() : new vqbrad() ; fieldmapper.standardRequest( - ['open-ils.permacrud', method], + ['open-ils.pcrud', method], { async: true, params: [authtoken, rad.fromHash({ id : ATTR_EDIT_ID }), ], oncomplete: function() { diff --git a/Open-ILS/xul/staff_client/chrome/content/cat/opac.js b/Open-ILS/xul/staff_client/chrome/content/cat/opac.js index 673eede35d..5e642273ba 100644 --- a/Open-ILS/xul/staff_client/chrome/content/cat/opac.js +++ b/Open-ILS/xul/staff_client/chrome/content/cat/opac.js @@ -708,8 +708,8 @@ function delete_mfhd(sre_id) { null, document.getElementById('offlineStrings').getString('cat.opac.record_deleted.confirm')) == 0) { var robj = g.network.request( - 'open-ils.permacrud', - 'open-ils.permacrud.delete.sre', + 'open-ils.pcrud', + 'open-ils.pcrud.delete.sre', [ses(),sre_id]); if (typeof robj.ilsevent != 'undefined') { alert(document.getElementById('offlineStrings').getFormattedString('cat.opac.record_deleted.error', [docid, robj.textcode, robj.desc]) + '\n'); @@ -746,11 +746,11 @@ function open_marc_editor(rec, label) { record : {marc : rec.marc()}, save : { label: 'Save ' + label, - func: function(xmlString) { // TODO: switch to pcrud, or define an sre update method in Serial.pm? - var method = 'open-ils.permacrud.update.' + rec.classname; + func: function(xmlString) { + var method = 'open-ils.pcrud.update.' + rec.classname; rec.marc(xmlString); g.network.request( - 'open-ils.permacrud', method, + 'open-ils.pcrud', method, [ses(), rec] ); xulG.reload_opac(); -- 2.11.0