non-cat vs pre-cat labels. Stop throwing an error dialog if a pre-cat checkout is...

git-svn-id: svn://svn.open-ils.org/ILS/trunk@8924 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/xul/staff_client/server/circ/checkout.js b/Open-ILS/xul/staff_client/server/circ/checkout.js
index 978cfdd..82a8c5f 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/checkout.js
+++ b/Open-ILS/xul/staff_client/server/circ/checkout.js
@@ -617,7 +617,7 @@ circ.checkout.prototype = {
                                                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 @@ circ.checkout.prototype = {
                                                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'));
                                                }
                                        } 
                                }

diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties b/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
index 3b89c60..fae4886 100644 (file)
--- a/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
@@ -42,7 +42,8 @@ staff.circ.checkout.non_cataloged.pending=Non-cataloged checkout pending...
 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.