From 3e8155cfaf6e627012338ba2906dab633adf6f8b Mon Sep 17 00:00:00 2001 From: pines Date: Wed, 12 Jul 2006 15:40:22 +0000 Subject: [PATCH] remember last configured server and use it by default git-svn-id: svn://svn.open-ils.org/ILS/trunk@4951 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../xul/staff_client/chrome/content/auth/controller.js | 18 +++++++++++++++++- Open-ILS/xul/staff_client/chrome/content/main/main.xul | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Open-ILS/xul/staff_client/chrome/content/auth/controller.js b/Open-ILS/xul/staff_client/chrome/content/auth/controller.js index ccc9bd55c9..321ba45bc6 100644 --- a/Open-ILS/xul/staff_client/chrome/content/auth/controller.js +++ b/Open-ILS/xul/staff_client/chrome/content/auth/controller.js @@ -123,6 +123,10 @@ auth.controller.prototype = { ws.name /*+ ' @ ' + ws.lib_shortname*/ ) ); + netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect'); + JSAN.use('util.file'); var file = new util.file('last_ws_server'); + file.set_object(obj.controller.view.server_prompt.value); + file.close(); } else { x.appendChild( document.createTextNode( @@ -174,8 +178,8 @@ auth.controller.prototype = { obj.controller.view.server_prompt.addEventListener( 'change', function (ev) { - obj.controller.render('ws_deck'); obj.test_server(ev.target.value); + obj.controller.render('ws_deck'); }, false ); @@ -186,6 +190,7 @@ auth.controller.prototype = { obj.controller.render(); obj.test_server( obj.controller.view.server_prompt.value ); + obj.controller.render('ws_deck'); if (typeof this.on_init == 'function') { this.error.sdump('D_AUTH','auth.controller.on_init()\n'); @@ -195,6 +200,14 @@ auth.controller.prototype = { 'test_server' : function(url) { var obj = this; + if (!url) { + netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect'); + JSAN.use('util.file'); var file = new util.file('last_ws_server'); + if (file._file.exists()) { + url = file.get_object(); file.close(); + obj.controller.view.server_prompt.value = url; + } + } obj.controller.view.submit_button.disabled = true; obj.controller.view.server_prompt.disabled = true; var s = document.getElementById('status'); @@ -205,6 +218,7 @@ auth.controller.prototype = { s.setAttribute('value','Please enter a server hostname.'); s.setAttribute('style','color: red;'); obj.controller.view.server_prompt.disabled = false; + obj.controller.view.server_prompt.focus(); return; } try { @@ -224,6 +238,7 @@ auth.controller.prototype = { obj.test_version(url); } catch(E) { obj.controller.view.server_prompt.disabled = false; + obj.controller.view.server_prompt.focus(); s.setAttribute('value','There was an error testing this hostname.'); s.setAttribute('style','color: red;'); obj.error.sdump('D_ERROR',E); @@ -235,6 +250,7 @@ auth.controller.prototype = { s.setAttribute('style','color: brown;'); obj.error.sdump('D_ERROR',E); obj.controller.view.server_prompt.disabled = false; + obj.controller.view.server_prompt.focus(); } }, diff --git a/Open-ILS/xul/staff_client/chrome/content/main/main.xul b/Open-ILS/xul/staff_client/chrome/content/main/main.xul index e91b8b6639..32e9a77c66 100644 --- a/Open-ILS/xul/staff_client/chrome/content/main/main.xul +++ b/Open-ILS/xul/staff_client/chrome/content/main/main.xul @@ -95,7 +95,7 @@