persist for splitter in patron display and search
authorpines <pines@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Sun, 27 Aug 2006 00:36:52 +0000 (00:36 +0000)
committerpines <pines@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Sun, 27 Aug 2006 00:36:52 +0000 (00:36 +0000)
git-svn-id: svn://svn.open-ils.org/ILS/trunk@5715 dcc99617-32d9-48b4-a31d-7c20da2025e4

Open-ILS/xul/staff_client/chrome/content/main/menu.js
Open-ILS/xul/staff_client/server/patron/barcode_entry.xul
Open-ILS/xul/staff_client/server/patron/display.js
Open-ILS/xul/staff_client/server/patron/display.xul
Open-ILS/xul/staff_client/server/patron/summary.xul

index 3a6b935..7aa28db 100644 (file)
@@ -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 } );
                                }
                        ],
                        
index 2ff28f4..3ab1d10 100644 (file)
 
                                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();
index 643da6e..937196e 100644 (file)
@@ -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) {
index 2cff9fe..7819f61 100644 (file)
 
                                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');
index 28a9f3b..1acddfc 100644 (file)
@@ -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'),
                                } );