typos, and working around the fun JSON number/text casting issue

git-svn-id: svn://svn.open-ils.org/ILS/trunk@8920 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 eec1f09..978cfdd 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/checkout.js
+++ b/Open-ILS/xul/staff_client/server/circ/checkout.js
@@ -614,10 +614,10 @@ circ.checkout.prototype = {
                                if (test_event(permit,1202 /* ITEM_NOT_CATALOGED */)) {
 
                                        if ( 1 == obj.error.yns_alert(
-                                               documents.getElementById('circStrings').getString('staff.circ.checkout.not_cataloged.confirm'),
-                                               documents.getElementById('circStrings').getString('staff.circ.alert'),
-                                               documents.getElementById('circStrings').getString('staff.circ.cancel'),
-                                               documents.getElementById('circStrings').getString('staff.circ.non_cataloged'),
+                                               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'),
                                                null,
                                                document.getElementById('circStrings').getString('staff.circ.confirm'),
                                                '/xul/server/skin/media/images/book_question.png'
@@ -646,7 +646,7 @@ circ.checkout.prototype = {
 
                                var stop_checkout = false;
                                for (var i = 0; i < test_permit.length; i++) {
-                                       switch(test_permit[i].ilsevent) {
+                                       switch(Number(test_permit[i].ilsevent)) {
                                                case 1216 /* PATRON_CARD_INACTIVE */ :
                                                case 1217 /* PATRON_INACTIVE */ :
                                                case 1224 /* PATRON_ACCOUNT_EXPIRED */ :
@@ -657,7 +657,7 @@ circ.checkout.prototype = {
 
                                for (var i = 0; i < test_permit.length; i++) {
                                        dump('found [' + test_permit[i].ilsevent + ']\n');
-                                       switch(test_permit[i].ilsevent) {
+                                       switch(Number(test_permit[i].ilsevent)) {
                                                case 1212 /* PATRON_EXCEEDS_OVERDUE_COUNT */ :
                                                        found_handled = true;
                                                break;

diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js
index 473d973..c6b9044 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/util.js
+++ b/Open-ILS/xul/staff_client/server/circ/util.js
@@ -33,7 +33,7 @@ circ.util.abort_transits = function(selection_list) {
                                var copy_id = selection_list[i].copy_id;
                                var robj = obj.network.simple_request('FM_ATC_VOID',[ ses(), { 'copyid' : copy_id } ]);
                                if (typeof robj.ilsevent != 'undefined') {
-                                       switch(robj.ilsevent) {
+                                       switch(Number(robj.ilsevent)) {
                                                case 1225 /* TRANSIT_ABORT_NOT_ALLOWED */ :
                                                        alert(document.getElementById('circString').getFormattedString('staff.circ.utils.abort_transits.not_allowed', [copy_id]) + '\n' + robj.desc);
                                                break;
@@ -514,12 +514,12 @@ circ.util.columns = function(modify,params) {
                        'hidden' : true,
                        'render' : function(my) {
                                if (my.acp && my.acp.call_number() == -1) {
-                                       return document.getElementById('commonStrings').getString('staff.circ.utils.not_cataloged');
+                                       return document.getElementById('circStrings').getString('staff.circ.utils.not_cataloged');
                                } else {
                                        if (!my.acn) {
                                                var x = network.simple_request("FM_ACN_RETRIEVE",[ my.acp.call_number() ]);
                                                if (x.ilsevent) {
-                                                       return document.getElementById('commonStrings').getString('staff.circ.utils.not_cataloged');
+                                                       return document.getElementById('circStrings').getString('staff.circ.utils.not_cataloged');
                                                } else {
                                                        my.acn = x; return x.label();
                                                }
@@ -577,7 +577,7 @@ circ.util.columns = function(modify,params) {
                        'primary' : false,
                        'hidden' : true,
                        'render' : function(my) {
-                               switch(my.acp.loan_duration()) {
+                               switch(Number(my.acp.loan_duration())) {
                                        case 1:
                                                return document.getElementById('circStrings').getString('staff.circ.utils.loan_duration.short');
                                                break;
@@ -613,7 +613,7 @@ circ.util.columns = function(modify,params) {
                        'primary' : false,
                        'hidden' : true,
                        'render' : function(my) {
-                               switch(my.acp.fine_level()) {
+                               switch(Number(my.acp.fine_level())) {
                                        case 1:
                                                return document.getElementById('circStrings').getString('staff.circ.utils.fine_level.low');
                                                break;
@@ -1379,21 +1379,17 @@ circ.util.hold_columns = function(modify,params) {
                        'primary' : false,
                        'hidden' : false,
                        'render' : function(my) {
-                               switch (my.status) {
+                               switch (Number(my.status)) {
                                        case 1:
-                                       case "1":
                                                return document.getElementById('circStrings').getString('staff.circ.utils.hold_status.1');
                                                break;
                                        case 2:
-                                       case "2":
                                                return document.getElementById('circStrings').getString('staff.circ.utils.hold_status.2');
                                                break;
                                        case 3:
-                                       case "3":
                                                return document.getElementById('circStrings').getString('staff.circ.utils.hold_status.3');
                                                break;
                                        case 4:
-                                       case "4":
                                                return document.getElementById('circStrings').getString('staff.circ.utils.hold_status.4');
                                                break;
                                        default:
@@ -1991,7 +1987,7 @@ circ.util.checkin_via_barcode2 = function(session,params,backdate,auto_print,che
                                msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.item_not_cataloged', [copy_status]);
                                msg + '\n';
                        }
-                       switch(check.copy.status()) {
+                       switch(Number(check.copy.status())) {
                                case 0: /* AVAILABLE */
                                case 7: /* RESHELVING */
                                        if (msg) {
@@ -2231,7 +2227,7 @@ circ.util.checkin_via_barcode2 = function(session,params,backdate,auto_print,che
                        error.standard_network_error_alert(document.getElementById('circStrings').getString('staff.circ.checkin.suggest_offline'));
                } else {
 
-                       switch (check.ilsevent) {
+                       switch (Number(check.ilsevent)) {
                                case 1203 /* COPY_BAD_STATUS */ :
                                case 1213 /* PATRON_BARRED */ :
                                case 1217 /* PATRON_INACTIVE */ :
@@ -2271,7 +2267,7 @@ circ.util.renew_via_barcode = function ( barcode, patron_id, async ) {
                                var renew = req.getResultObject();
                                if (typeof renew.ilsevent != 'undefined') renew = [ renew ];
                                for (var j = 0; j < renew.length; j++) {
-                                       switch(renew[j].ilsevent) {
+                                       switch(Number(renew[j].ilsevent)) {
                                                case 0 /* SUCCESS */ : break;
                                                case 5000 /* PERM_FAILURE */: break;
                                                case 1212 /* PATRON_EXCEEDS_OVERDUE_COUNT */ : break;