From bcf347716ba08caaec09640f766f6ae9f5ced343 Mon Sep 17 00:00:00 2001 From: erickson Date: Sun, 27 Jul 2008 15:09:22 +0000 Subject: [PATCH] ported getbysession to fieldmapper.standardrequest to take advantage of default error handlers git-svn-id: svn://svn.open-ils.org/ILS/trunk@10148 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/js/dojo/openils/User.js | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/Open-ILS/web/js/dojo/openils/User.js b/Open-ILS/web/js/dojo/openils/User.js index 8dd7b446c8..0b09011d1f 100644 --- a/Open-ILS/web/js/dojo/openils/User.js +++ b/Open-ILS/web/js/dojo/openils/User.js @@ -51,20 +51,25 @@ if(!dojo._hasResource["openils.User"]) { getBySession : function(onComplete) { var _u = this; - var req = OpenSRF.CachedClientSession('open-ils.auth').request('open-ils.auth.session.retrieve', _u.authtoken); + var req = ['open-ils.auth', 'open-ils.auth.session.retrieve']; + var params = [_u.authtoken]; + if(onComplete) { - req.oncomplete = function(r) { - var user = r.recv().content(); - _u.user = user; - if (!openils.User.user) openils.User.user = _u.user; - if(onComplete) - onComplete(user); - } - req.send(); + fieldmapper.standardRequest( + req, { + async: true, + params: params, + oncomplete : function(r) { + var user = r.recv().content(); + _u.user = user; + if (!openils.User.user) openils.User.user = _u.user; + if(onComplete) + onComplete(user); + } + } + ); } else { - req.timeout = 10; - req.send(); - _u.user = req.recv().content(); + _u.user = fieldmapper.standardRequest(req, params); if (!openils.User.user) openils.User.user = _u.user; return _u.user; } -- 2.11.0