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

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 7b1fecb..c041b3e 100644 (file)
--- 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 0e2054e..621cac8 100644 (file)
--- 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 a280ef2..4506efa 100644 (file)
--- 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 8e8c863..ad31894 100644 (file)
--- 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 753aa9c..523ba85 100644 (file)
--- 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 4b1b581..89caba8 100644 (file)
--- 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>
 
 <%def name='block_js()'>
-
-    <!-- set up some global JS variables -->
-    <script type='text/javascript'>
-        var oilsAuthtoken = '${c.oils.core.authtoken.value}';
-    </script>
-
     <!-- some of these will dojo-ized ... -->
     <script src='${c.oils.core.media_prefix.value}/js/opensrf/JSON_v1.js'> </script>
     <script src='${c.oils.core.media_prefix.value}/js/opensrf/opensrf.js'> </script>
@@ -65,6 +59,12 @@
         dojo.require("dojox.grid._data.model");
         dojo.require("fieldmapper.dojoData");
         dojo.require("fieldmapper.OrgUtils");
+        dojo.require("openils.User");
+    </script>
+
+    <!-- set up some global JS variables -->
+    <script type='text/javascript'>
+        openils.User.authtoken = '${c.oils.core.authtoken.value}';
     </script>
 </%def>
 

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 2b662a0..fb85ed6 100644 (file)
--- 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();