From: Jason Etheridge Date: Wed, 25 May 2011 20:56:24 +0000 (-0400) Subject: missed this way back when. fix multiple event override handling (for ilsevent lackin... X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=8a26888af4c658849d4089ace91c91ecc005985d;p=evergreen%2Fbjwebb.git missed this way back when. fix multiple event override handling (for ilsevent lacking events), re: lp#757634. Also add some missing typeof's Signed-off-by: Jason Etheridge --- diff --git a/Open-ILS/xul/staff_client/chrome/content/util/network.js b/Open-ILS/xul/staff_client/chrome/content/util/network.js index 5cba3852c..4fcca5098 100644 --- a/Open-ILS/xul/staff_client/chrome/content/util/network.js +++ b/Open-ILS/xul/staff_client/chrome/content/util/network.js @@ -457,7 +457,7 @@ util.network.prototype = { auto_override = true; for (var i = 0; i < r.length; i++) { if ( - (r[i].ilsevent != 'undefined') && + (typeof r[i].ilsevent != 'undefined') && ( (override_params.auto_override_these_events.indexOf( r[i].ilsevent == null ? null : Number(r[i].ilsevent) ) != -1) || (override_params.auto_override_these_events.indexOf( r[i].textcode ) != -1) @@ -529,9 +529,9 @@ util.network.prototype = { var found_good = false; var found_bad = false; for (var i = 0; i < result.length; i++) { if ( - (result[i].ilsevent != 'undefined') && + (typeof result[i].ilsevent != 'undefined') && ( - (override_params.overridable_events.indexOf( result[i].ilsevent == null || result.ilsevent == '' ? null : Number(result[i].ilsevent) ) != -1) || + (override_params.overridable_events.indexOf( result[i].ilsevent == null || result[i].ilsevent == '' ? null : Number(result[i].ilsevent) ) != -1) || (override_params.overridable_events.indexOf( result[i].textcode ) != -1) ) ) {