[open-ils-commits] r14876 - trunk/Open-ILS/xul/staff_client/server/circ (erickson)

[svn at svn.open-ils.org]

Author: erickson
Date: 2009-11-11 17:01:29 -0500 (Wed, 11 Nov 2009)
New Revision: 14876

Modified:
   trunk/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js
Log:
null workstation sanity checks part 2

Modified: trunk/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js	2009-11-11 21:47:19 UTC (rev 14875)
+++ trunk/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.js	2009-11-11 22:01:29 UTC (rev 14876)
@@ -316,13 +316,13 @@
                 network.simple_request('FM_CIRC_CHAIN', [ses(), details.circ.id() ], function(req) { // Tiny race condition between details.circ and circs[circs.length-1] here, but meh :)
                     try {
                         var circs = req.getResultObject();
-                        set("checkout_workstation", typeof circs[0].workstation() == 'object' ? circs[0].workstation().name() : circs[0].workstation() );
+                        set("checkout_workstation", (typeof circs[0].workstation() == 'object' && circs[0].workstation() != null) ? circs[0].workstation().name() : circs[0].workstation() );
                     } catch(E) {
                         alert('Error in alternate_copy_summary.js, FM_CIRC_CHAIN: ' + E);
                     }
                 } );
             } else {
-                set("checkout_workstation", typeof details.circ.workstation() == 'object' ? details.circ.workstation().name() : details.circ.workstation() ); 
+                set("checkout_workstation", (typeof details.circ.workstation() == 'object' && details.circ.workstation() != null) ? details.circ.workstation().name() : details.circ.workstation() );
             }
             set("billings", details.circ.billings()); 
             set("payments", details.circ.payments());