we changed RemoteRequest.. local chrome needs XML_HTTP_SERVER set, always

git-svn-id: svn://svn.open-ils.org/ILS/trunk@3372 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/xul/staff_client/chrome/content/admin/survey_wizard.xul b/Open-ILS/xul/staff_client/chrome/content/admin/survey_wizard.xul
index f839da7..61ea692 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/admin/survey_wizard.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/admin/survey_wizard.xul
@@ -53,6 +53,8 @@
                                JSAN.use('OpenILS.data'); g.OpenILS = {};
                                g.OpenILS.data = new OpenILS.data(); g.OpenILS.data.init({'via':'stash'});
 
+                               XML_HTTP_SERVER = g.OpenILS.data.server_unadorned;
+
                                JSAN.use('util.network');
                                g.network = new util.network();
 

diff --git a/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul b/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
index be45893..b62d9a6 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
@@ -42,6 +42,9 @@
                                JSAN.use('util.error'); g.error = new util.error();
                                g.error.sdump('D_TRACE','my_init() for cat/opac.xul');
 
+                               JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+                               XML_HTTP_SERVER = data.server_unadorned;
+
                                JSAN.use('util.network'); g.network = new util.network();
 
                                g.cgi = new CGI();

diff --git a/Open-ILS/xul/staff_client/chrome/content/legacy/_browse.xul b/Open-ILS/xul/staff_client/chrome/content/legacy/_browse.xul
index e8fdf93..210b537 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/legacy/_browse.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/legacy/_browse.xul
@@ -65,6 +65,8 @@
 
                                JSAN.use('OpenILS.data');
                                g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+                               XML_HTTP_SERVER = g.data.server_unadorned;
+
                                mw.G.my_orgs = g.data.list.my_aou;
                                mw.G.my_orgs_hash = g.data.hash.my_aou;
                                mw.G.org_tree = g.data.tree.aou;

diff --git a/Open-ILS/xul/staff_client/chrome/content/legacy/_marc.xul b/Open-ILS/xul/staff_client/chrome/content/legacy/_marc.xul
index cf0b43f..54e1fad 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/legacy/_marc.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/legacy/_marc.xul
@@ -52,6 +52,9 @@
                                JSAN.use('util.error'); g.error = new util.error();
                                g.error.sdump('D_TRACE','my_pre_init() for marc.xul');
 
+                               JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+                               XML_HTTP_SERVER = data.server_unadorned;
+
                                mw.G = {};
                                mw.G.main_test_variable = 'Hello World';
                                g.cgi = new CGI();

diff --git a/Open-ILS/xul/staff_client/chrome/content/main/main.js b/Open-ILS/xul/staff_client/chrome/content/main/main.js
index 6f85618..6355c11 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/main/main.js
+++ b/Open-ILS/xul/staff_client/chrome/content/main/main.js
@@ -76,6 +76,9 @@ function main_init() {
                G.auth.on_login = function() {
 
                        var url = G.auth.controller.view.server_prompt.value || urls.remote;
+
+                       G.data.server_unadorned = url; G.data.stash('server_unadorned'); G.data.stash_retrieve();
+
                        if (! url.match( '^http://' ) ) url = 'http://' + url;
 
                        G.data.server = url; G.data.stash('server'); G.data.stash_retrieve();

diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame.xul b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame.xul
index 79365ab..c549f17 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame.xul
@@ -63,8 +63,8 @@
 
                                JSAN.use('util.window'); g.window = new util.window();
                                JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'});
+                               XML_HTTP_SERVER = g.data.server_unadorned;
 
-                               // FIXME - Use workstation ou when we get it instead of staff home_ou
                                document.title = g.window.appshell_name_increment() + ': ' 
                                        + g.data.list.au[0].usrname() + ' (' + g.data.ws_name + '@' 
                                        + g.data.hash.aou[ g.data.list.au[0].ws_ou() ].shortname() + ')';

diff --git a/Open-ILS/xul/staff_client/chrome/content/util/browser.xul b/Open-ILS/xul/staff_client/chrome/content/util/browser.xul
index 2be1fbb..af0c17f 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/util/browser.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/util/browser.xul
@@ -39,6 +39,9 @@
                                JSAN.use('util.error'); g.error = new util.error();
                                g.error.sdump('D_TRACE','my_init() for util_browser.xul');
 
+                               JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+                               XML_HTTP_SERVER = data.server_unadorned;
+
                                g.cgi = new CGI();
                                var name = g.cgi.param('tab_name') || g.cgi.param('name') || null;
                                if (!name) {