[open-ils-commits] r8924 - in trunk/Open-ILS/xul/staff_client/server: circ locale/en-US

[svn at svn.open-ils.org]

Author: phasefx
Date: 2008-03-08 03:50:59 -0500 (Sat, 08 Mar 2008)
New Revision: 8924

Modified:
   trunk/Open-ILS/xul/staff_client/server/circ/checkout.js
   trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
Log:
non-cat vs pre-cat labels.  Stop throwing an error dialog if a pre-cat checkout is cancelled

Modified: trunk/Open-ILS/xul/staff_client/server/circ/checkout.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/checkout.js	2008-03-08 07:55:15 UTC (rev 8923)
+++ trunk/Open-ILS/xul/staff_client/server/circ/checkout.js	2008-03-08 08:50:59 UTC (rev 8924)
@@ -617,7 +617,7 @@
 						document.getElementById('circStrings').getString('staff.circ.checkout.not_cataloged.confirm'),
 						document.getElementById('circStrings').getString('staff.circ.alert'),
 						document.getElementById('circStrings').getString('staff.circ.cancel'),
-						document.getElementById('circStrings').getString('staff.circ.non_cataloged'),
+						document.getElementById('circStrings').getString('staff.circ.pre_cataloged'),
 						null,
 						document.getElementById('circStrings').getString('staff.circ.confirm'),
 						'/xul/server/skin/media/images/book_question.png'
@@ -636,7 +636,7 @@
 						if (params.dummy_title !== '') { 
 							obj._checkout( params );
 						} else {
-							throw(document.getElementById('circStrings').getString('staff.circ.checkout.cancelled'));
+							alert(document.getElementById('circStrings').getString('staff.circ.checkout.cancelled'));
 						}
 					} 
 				}

Modified: trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties	2008-03-08 07:55:15 UTC (rev 8923)
+++ trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties	2008-03-08 08:50:59 UTC (rev 8924)
@@ -42,7 +42,8 @@
 staff.circ.checkout.barcode.pending=%1$s checkout pending...
 staff.circ.checkout.barcode.failed.alert=Check Out Failed %1$s
 staff.circ.checkout.override.confirm=Override Checkout Failure?
-staff.circ.checkout.not_cataloged.confirm=Mis-scan or non-cataloged item.  Checkout as a non-cataloged item?
+staff.circ.checkout.not_cataloged.confirm=Mis-scan or non-cataloged item.  Checkout as a pre-cataloged item?
+staff.circ.pre_cataloged=Pre-cataloged
 staff.circ.non_cataloged=Non-cataloged
 staff.circ.checkout.cancelled=Checkout cancelled
 staff.circ.checkout.card.inactive=The card used to retrieve this account is inactive and may not be used to circulate items.