From 7da107c6e19c43a04e4cf616a3e13d46cd290e91 Mon Sep 17 00:00:00 2001 From: erickson Date: Sun, 13 Apr 2008 15:52:06 +0000 Subject: [PATCH] using new openils.User class to manage authtokens git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@9326 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../oilsweb/public/oils/media/js/openils/acq/CurrencyType.js | 2 +- .../oilsweb/oilsweb/public/oils/media/js/openils/acq/Fund.js | 2 +- .../public/oils/media/js/openils/acq/FundingSource.js | 8 ++++---- .../oilsweb/public/oils/media/js/openils/acq/Picklist.js | 2 +- .../oilsweb/public/oils/media/js/openils/acq/Provider.js | 2 +- Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html | 12 ++++++------ .../oils/default/acq/financial/view_funding_source.html | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/js/openils/acq/CurrencyType.js b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/js/openils/acq/CurrencyType.js index 7b1fecb154..c041b3e6c6 100644 --- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/js/openils/acq/CurrencyType.js +++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/js/openils/acq/CurrencyType.js @@ -28,7 +28,7 @@ if(!dojo._hasResource["openils.acq.CurrencyType"]) { */ openils.acq.CurrencyType.fetchAll = function(onComplete) { var req = new OpenSRF.ClientSession('open-ils.acq').request( - 'open-ils.acq.currency_type.all.retrieve', oilsAuthtoken); + 'open-ils.acq.currency_type.all.retrieve', openils.User.authtoken); req.oncomplete = function(r) { var msg = r.recv(); diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/js/openils/acq/Fund.js b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/js/openils/acq/Fund.js index 0e2054e531..621cac86ec 100644 --- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/js/openils/acq/Fund.js +++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/js/openils/acq/Fund.js @@ -31,7 +31,7 @@ openils.acq.Fund.loadGrid = function(domId, columns) { var gridRefs = util.Dojo.buildSimpleGrid(domId, columns, [], 'id', true); var ses = new OpenSRF.ClientSession('open-ils.acq'); var req = ses.request('open-ils.acq.fund.org.retrieve', - oilsAuthtoken, null, {flesh_summary:1}); + openils.User.authtoken, null, {flesh_summary:1}); req.oncomplete = function(r) { var msg diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/js/openils/acq/FundingSource.js b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/js/openils/acq/FundingSource.js index a280ef2784..4506efaecb 100644 --- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/js/openils/acq/FundingSource.js +++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/js/openils/acq/FundingSource.js @@ -31,7 +31,7 @@ openils.acq.FundingSource.createStore = function(onComplete) { /** Fetches the list of funding_sources and builds a grid from them */ var ses = new OpenSRF.ClientSession('open-ils.acq'); var req = ses.request('open-ils.acq.funding_source.org.retrieve', - oilsAuthtoken, null, {flesh_summary:1}); + openils.User.authtoken, null, {flesh_summary:1}); req.oncomplete = function(r) { var msg @@ -61,7 +61,7 @@ openils.acq.FundingSource.create = function(fields, onCreateComplete) { fs[field](fields[field]); var ses = new OpenSRF.ClientSession('open-ils.acq'); - var req = ses.request('open-ils.acq.funding_source.create', oilsAuthtoken, fs); + var req = ses.request('open-ils.acq.funding_source.create', openils.User.authtoken, fs); req.oncomplete = function(r) { var msg = r.recv(); @@ -81,7 +81,7 @@ openils.acq.FundingSource.createCredit = function(fields, onCreateComplete) { var ses = new OpenSRF.ClientSession('open-ils.acq'); var req = ses.request( - 'open-ils.acq.funding_source_credit.create', oilsAuthtoken, fsc); + 'open-ils.acq.funding_source_credit.create', openils.User.authtoken, fsc); req.oncomplete = function(r) { var msg = r.recv(); @@ -110,7 +110,7 @@ openils.acq.FundingSource._deleteList = function(list, idx, onComplete) { return onComplete(); var ses = new OpenSRF.ClientSession('open-ils.acq'); - var req = ses.request('open-ils.acq.funding_source.delete', oilsAuthtoken, list[idx]); + var req = ses.request('open-ils.acq.funding_source.delete', openils.User.authtoken, list[idx]); delete openils.acq.FundingSource.cache[list[idx]]; req.oncomplete = function(r) { diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/js/openils/acq/Picklist.js b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/js/openils/acq/Picklist.js index 8e8c8630f7..ad318944c1 100644 --- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/js/openils/acq/Picklist.js +++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/js/openils/acq/Picklist.js @@ -25,7 +25,7 @@ dojo.declare('openils.acq.Picklist', null, { var gridRefs = util.Dojo.buildSimpleGrid(domId, columns, [], 'id', true); var ses = new OpenSRF.ClientSession('open-ils.acq'); var req = ses.request('open-ils.acq.lineitem.picklist.retrieve', - oilsAuthtoken, pl_id, {flesh_attrs:1}); + openils.User.authtoken, pl_id, {flesh_attrs:1}); req.oncomplete = function(r) { var msg diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/js/openils/acq/Provider.js b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/js/openils/acq/Provider.js index 753aa9c92e..523ba854b9 100644 --- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/js/openils/acq/Provider.js +++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/js/openils/acq/Provider.js @@ -31,7 +31,7 @@ openils.acq.Provider.loadGrid = function(domId, columns) { var gridRefs = util.Dojo.buildSimpleGrid(domId, columns, [], 'id', true); var ses = new OpenSRF.ClientSession('open-ils.acq'); - var req = ses.request('open-ils.acq.provider.org.retrieve', oilsAuthtoken); + var req = ses.request('open-ils.acq.provider.org.retrieve', openils.User.authtoken); req.oncomplete = function(r) { var msg diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html index 4b1b581b8a..89caba83de 100644 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html @@ -33,12 +33,6 @@ <%def name='block_js()'> - - - - @@ -65,6 +59,12 @@ dojo.require("dojox.grid._data.model"); dojo.require("fieldmapper.dojoData"); dojo.require("fieldmapper.OrgUtils"); + dojo.require("openils.User"); + + + + diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_funding_source.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_funding_source.html index 2b662a0dc2..fb85ed6e79 100644 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_funding_source.html +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_funding_source.html @@ -32,7 +32,7 @@ /** fetch the fleshed funding source ----- */ function loadFS() { var req = ses.request( - 'open-ils.acq.funding_source.retrieve', oilsAuthtoken, fundingSourceID, + 'open-ils.acq.funding_source.retrieve', openils.User.authtoken, fundingSourceID, {flesh_summary:1, flesh_credits:1,flesh_allocations:1} ); @@ -65,7 +65,7 @@ if(!data) return; var fundId = data.fund; if(!fundCache[fundId]) { - req = ses.request('open-ils.acq.fund.retrieve', oilsAuthtoken, fundId); + req = ses.request('open-ils.acq.fund.retrieve', openils.User.authtoken, fundId); req.timeout = 10; req.send(); fundCache[fundId] = req.recv().content(); -- 2.11.0