From 946a4b13d37ff58b2f03e228c74e1dd1abb11653 Mon Sep 17 00:00:00 2001 From: phasefx Date: Sat, 8 Mar 2008 08:50:59 +0000 Subject: [PATCH] non-cat vs pre-cat labels. Stop throwing an error dialog if a pre-cat checkout is cancelled git-svn-id: svn://svn.open-ils.org/ILS/trunk@8924 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/xul/staff_client/server/circ/checkout.js | 4 ++-- Open-ILS/xul/staff_client/server/locale/en-US/circ.properties | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Open-ILS/xul/staff_client/server/circ/checkout.js b/Open-ILS/xul/staff_client/server/circ/checkout.js index 978cfdd1ac..82a8c5f9ec 100644 --- 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 3b89c60d7e..fae4886f0b 100644 --- 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. -- 2.43.2