From 12b3308d0595c9ea612eac9658ba0fb07968465c Mon Sep 17 00:00:00 2001 From: pines Date: Sun, 27 Aug 2006 00:36:52 +0000 Subject: [PATCH] persist for splitter in patron display and search git-svn-id: svn://svn.open-ils.org/ILS/trunk@5715 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../xul/staff_client/chrome/content/main/menu.js | 4 ++-- .../staff_client/server/patron/barcode_entry.xul | 7 ++++--- .../xul/staff_client/server/patron/display.js | 16 +++++++--------- .../xul/staff_client/server/patron/display.xul | 8 ++++---- .../xul/staff_client/server/patron/summary.xul | 4 ++-- 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu.js b/Open-ILS/xul/staff_client/chrome/content/main/menu.js index 3a6b9353e1..7aa28db469 100644 --- a/Open-ILS/xul/staff_client/chrome/content/main/menu.js +++ b/Open-ILS/xul/staff_client/chrome/content/main/menu.js @@ -318,8 +318,8 @@ main.menu.prototype = { alert('No patron visited yet this session.'); return; } - var url = obj.url_prefix( urls.XUL_PATRON_DISPLAY + '?id=' + window.escape( obj.data.last_patron ) ); - obj.set_tab( url ); + var url = obj.url_prefix( urls.XUL_PATRON_DISPLAY ); // + '?id=' + window.escape( obj.data.last_patron ) ); + obj.set_tab( url, {}, { 'id' : obj.data.last_patron } ); } ], diff --git a/Open-ILS/xul/staff_client/server/patron/barcode_entry.xul b/Open-ILS/xul/staff_client/server/patron/barcode_entry.xul index 2ff28f408f..3ab1d10955 100644 --- a/Open-ILS/xul/staff_client/server/patron/barcode_entry.xul +++ b/Open-ILS/xul/staff_client/server/patron/barcode_entry.xul @@ -96,14 +96,15 @@ sound.good(); - var loc = urls.XUL_PATRON_DISPLAY + '?barcode=' + window.escape(barcode); + var loc = urls.XUL_PATRON_DISPLAY; // + '?barcode=' + window.escape(barcode); if (typeof window.xulG == 'object' && typeof window.xulG.set_tab == 'function') { - window.xulG.set_tab( loc ); + window.xulG.set_tab( loc, {}, { 'barcode' : barcode } ); } else { - location.href = loc; + location.href = loc + '?barcode=' + window.escape(barcode); +; } } catch(E) { tb.select(); tb.focus(); diff --git a/Open-ILS/xul/staff_client/server/patron/display.js b/Open-ILS/xul/staff_client/server/patron/display.js index 643da6e539..937196ea9a 100644 --- a/Open-ILS/xul/staff_client/server/patron/display.js +++ b/Open-ILS/xul/staff_client/server/patron/display.js @@ -77,10 +77,9 @@ patron.display.prototype = { if (typeof window.xulG == 'object' && typeof window.xulG.new_tab == 'function') { for (var i = 0; i < obj.retrieve_ids.length; i++) { try { - var url = urls.XUL_PATRON_DISPLAY - + '?id=' + window.escape( obj.retrieve_ids[i] ); + var url = urls.XUL_PATRON_DISPLAY; //+ '?id=' + window.escape( obj.retrieve_ids[i] ); window.xulG.new_tab( - url + url, {}, { 'id' : obj.retrieve_ids[i] } ); } catch(E) { alert(E); @@ -310,12 +309,12 @@ patron.display.prototype = { obj.controller.view.cmd_patron_info.setAttribute('disabled','true'); obj.controller.view.patron_name.setAttribute('value','Retrieving...'); document.documentElement.setAttribute('class',''); - var frame = obj.left_deck.set_iframe( - urls.XUL_PATRON_SUMMARY - +'?barcode=' + window.escape(obj.barcode) - +'&id=' + window.escape(obj.id), + var frame = obj.left_deck.reset_iframe( + urls.XUL_PATRON_SUMMARY, {}, { + 'barcode' : obj.barcode, + 'id' : obj.id, 'on_finished' : function(patron) { obj.patron = patron; obj.controller.render(); @@ -477,8 +476,7 @@ patron.display.prototype = { setTimeout( function() { var frame = obj.left_deck.set_iframe( - urls.XUL_PATRON_SUMMARY - +'?id=' + window.escape(list[0]), + urls.XUL_PATRON_SUMMARY + '?id=' + window.escape(list[0]), {}, { 'on_finished' : function(patron) { diff --git a/Open-ILS/xul/staff_client/server/patron/display.xul b/Open-ILS/xul/staff_client/server/patron/display.xul index 2cff9fe2ad..7819f61acd 100644 --- a/Open-ILS/xul/staff_client/server/patron/display.xul +++ b/Open-ILS/xul/staff_client/server/patron/display.xul @@ -47,10 +47,10 @@ JSAN.use('patron.display'); g.patron = new patron.display(); g.patron.init( { - 'barcode' : g.cgi.param('barcode') , - 'id' : g.cgi.param('id') , - 'query' : g.cgi.param('query'), - 'doit' : g.cgi.param('doit'), + 'barcode' : g.cgi.param('barcode') || xulG.barcode , + 'id' : g.cgi.param('id') || xulG.id, + 'query' : g.cgi.param('query') || xulG.query, + 'doit' : g.cgi.param('doit') || xulG.doit, } ); //document.documentElement.style.setProperty('font-size-adjust','1','important'); diff --git a/Open-ILS/xul/staff_client/server/patron/summary.xul b/Open-ILS/xul/staff_client/server/patron/summary.xul index 28a9f3b8da..1acddfceeb 100644 --- a/Open-ILS/xul/staff_client/server/patron/summary.xul +++ b/Open-ILS/xul/staff_client/server/patron/summary.xul @@ -46,8 +46,8 @@ JSAN.use('patron.summary'); g.summary = new patron.summary(); g.summary.init( { - 'barcode' : g.cgi.param('barcode') , - 'id' : g.cgi.param('id') , + 'barcode' : g.cgi.param('barcode') || xulG.barcode, + 'id' : g.cgi.param('id')|| xulG.id, 'show_name' : g.cgi.param('show_name'), } ); -- 2.43.2