[open-ils-commits] r18880 - in trunk/Open-ILS/xul/staff_client/server: circ patron (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2010-11-30 14:51:27 -0500 (Tue, 30 Nov 2010)
New Revision: 18880

Modified:
   trunk/Open-ILS/xul/staff_client/server/circ/checkin.js
   trunk/Open-ILS/xul/staff_client/server/patron/display.js
   trunk/Open-ILS/xul/staff_client/server/patron/display.xul
   trunk/Open-ILS/xul/staff_client/server/patron/display_horiz.xul
Log:
have the patron display default to the bills interface if spawned from the red-text label in the Check In UI


Modified: trunk/Open-ILS/xul/staff_client/server/circ/checkin.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/checkin.js	2010-11-30 19:09:21 UTC (rev 18879)
+++ trunk/Open-ILS/xul/staff_client/server/circ/checkin.js	2010-11-30 19:51:27 UTC (rev 18880)
@@ -419,7 +419,7 @@
                             m + document.getElementById('circStrings').getFormattedString('staff.circ.utils.billable.amount', [row.my.acp.barcode(), util.money.sanitize(bill.balance_owed())]) + '  '
                         );
                         no_change_label.setAttribute('hidden','false');
-                        no_change_label.setAttribute('onclick','xulG.new_patron_tab({},{"id" : '+bill.usr()+' })');
+                        no_change_label.setAttribute('onclick','xulG.new_patron_tab({},{"id" : '+bill.usr()+', "show" : "bills" })');
                     }
                     if (document.getElementById('fine_tally')) {
                         var amount = Number( document.getElementById('fine_tally').getAttribute('amount') ) + Number( bill.balance_owed() );

Modified: trunk/Open-ILS/xul/staff_client/server/patron/display.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/display.js	2010-11-30 19:09:21 UTC (rev 18879)
+++ trunk/Open-ILS/xul/staff_client/server/patron/display.js	2010-11-30 19:51:27 UTC (rev 18880)
@@ -620,7 +620,7 @@
                     'barcode' : obj.barcode,
                     'id' : obj.id,
                     'refresh' : function() { obj.refresh_all(); },
-                    'on_finished' : obj.gen_patron_summary_finish_func(),
+                    'on_finished' : obj.gen_patron_summary_finish_func(params),
                     'stop_sign_page' : obj.gen_patron_stop_sign_page_func(),
                     'spawn_group_interface' : function() { obj.spawn_group_interface(); },
                     'new_patron_tab' : function(a,b) { return xulG.new_patron_tab(a,b); },
@@ -643,6 +643,7 @@
             );
             netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
             obj.summary_window = get_contentWindow(frame);
+
         } else {
             obj.render_search_form(params);
         }
@@ -843,7 +844,7 @@
         }
     },
 
-    'gen_patron_summary_finish_func' : function() {
+    'gen_patron_summary_finish_func' : function(display_params) {
         var obj = this;
 
         return function(patron,params) {
@@ -869,9 +870,20 @@
                     }
                 }
 
-                if (!obj._checkout_spawned) {
-                    obj.spawn_checkout_interface();
-                    obj._checkout_spawned = true;
+                if (display_params['show']) {
+                    setTimeout(
+                        function() {
+                            switch(display_params['show']) {
+                                case 'bills' : util.widgets.dispatch('command','cmd_patron_bills'); break;
+                            }
+                        },
+                        0
+                    );
+                } else {
+                    if (!obj._checkout_spawned) {
+                        obj.spawn_checkout_interface();
+                        obj._checkout_spawned = true;
+                    }
                 }
 
                 if (obj.stop_checkouts && obj.checkout_window) {

Modified: trunk/Open-ILS/xul/staff_client/server/patron/display.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/display.xul	2010-11-30 19:09:21 UTC (rev 18879)
+++ trunk/Open-ILS/xul/staff_client/server/patron/display.xul	2010-11-30 19:51:27 UTC (rev 18880)
@@ -50,7 +50,8 @@
                     'barcode' : xul_param('barcode'),
                     'id' : xul_param('id'),
                     'query' : xul_param('query'),
-                    'doit' : xul_param('doit')
+                    'doit' : xul_param('doit'),
+                    'show' : xul_param('show')
                 } );
 
             //document.documentElement.style.setProperty('font-size-adjust','1','important');

Modified: trunk/Open-ILS/xul/staff_client/server/patron/display_horiz.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/display_horiz.xul	2010-11-30 19:09:21 UTC (rev 18879)
+++ trunk/Open-ILS/xul/staff_client/server/patron/display_horiz.xul	2010-11-30 19:51:27 UTC (rev 18880)
@@ -50,7 +50,8 @@
                     'barcode' : xul_param('barcode'),
                     'id' : xul_param('id'),
                     'query' : xul_param('query'),
-                    'doit' : xul_param('doit')
+                    'doit' : xul_param('doit'),
+                    'show' : xul_param('show')
                 } );
 
             //document.documentElement.style.setProperty('font-size-adjust','1','important');