From: pines Date: Sun, 13 May 2007 08:19:26 +0000 (+0000) Subject: a move toward using xulG instead of URL query params for better caching X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=ac300941b7d05bb613ed3b609eed49ff5510d6d1;p=Evergreen.git a move toward using xulG instead of URL query params for better caching git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_0@7284 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Evergreen/xul/staff_client/server/patron/ue.js b/Evergreen/xul/staff_client/server/patron/ue.js index 9e77d696f2..4aef839946 100644 --- a/Evergreen/xul/staff_client/server/patron/ue.js +++ b/Evergreen/xul/staff_client/server/patron/ue.js @@ -19,8 +19,12 @@ function uEditInit() { _debug('uEditInit(): ' + location.search); cgi = new CGI(); - session = cgi.param('ses'); - clone = cgi.param('clone'); + session = cgi.param('ses'); + if (xulG) if (xulG.ses) session = xulG.ses; + if (xulG) if (xulG.params) if (xulG.params.ses) session = xulG.params.ses; + clone = cgi.param('clone'); + if (xulG) if (xulG.clone) clone = xulG.clone; + if (xulG) if (xulG.params) if (xulG.params.clone) clone = xulG.params.clone; if(!session) throw "User session is not defined"; fetchUser(session); @@ -92,7 +96,10 @@ function uEditBuild() { fetchHighestPermOrgs( SESSION, USER.id(), myPerms ); uEditBuildLibSelector(); - patron = fetchFleshedUser(cgi.param('usr')); + var usr = cgi.param('usr'); + if (xulG) if (xulG.usr) usr = xulG.usr; + if (xulG) if (xulG.params) if (xulG.params.usr) usr = xulG.params.usr; + patron = fetchFleshedUser(usr); if(!patron) patron = uEditNewPatron(); uEditDraw( @@ -535,7 +542,10 @@ function uEditSaveUser(cloneme) { !patron.isnew() ) { _debug("xulG clone spawning new interface..."); - window.xulG.spawn_editor({ses:cgi.param('ses'),clone:cloneme}); + var ses = cgi.param('ses'); + if (xulG) if (xulG.ses) ses = xulG.ses; + if (xulG) if (xulG.params) if (xulG.params.ses) ses = xulG.params.ses; + window.xulG.spawn_editor({ses:ses,clone:cloneme}); uEditRefresh(); } else { @@ -572,7 +582,9 @@ function uEditCancel() { var href = location.href; href = href.replace(/\&?usr=\d+/, ''); href = href.replace(/\&?clone=\d+/, ''); - var id = cgi.param('usr') + var id = cgi.param('usr'); + if (xulG) if (xulG.usr) id = xulG.usr; + if (xulG) if (xulG.params) if (xulG.params.usr) id = xulG.params.usr; /* reload the current user if available */ if( id ) href += "&usr=" + id; location.href = href; diff --git a/Evergreen/xul/staff_client/server/patron/ue_config.js b/Evergreen/xul/staff_client/server/patron/ue_config.js index 6b6449ab5b..2b3741c27f 100644 --- a/Evergreen/xul/staff_client/server/patron/ue_config.js +++ b/Evergreen/xul/staff_client/server/patron/ue_config.js @@ -998,9 +998,12 @@ function uEditCheckSharedAddr(patron, address, tbody, row) { hideMe($n(row, 'owner_link_div')); } else { - + + var ses = cgi.param('ses'); + if (xulG) if (xulG.ses) ses = xulG.ses; + if (xulG) if (xulG.params) if (xulG.params.ses) ses = xulG.params.ses; link.onclick = - function() { window.xulG.spawn_editor({ses:cgi.param('ses'),usr:id}) }; + function() { window.xulG.spawn_editor({ses:ses,usr:id}) }; if( userCache[id] ) { var usr = userCache[id];