[open-ils-commits] [GIT] Evergreen ILS branch rel_2_0 updated. 51523ac6db6a4b78ca6053ab0df645698f017db8
Evergreen Git
git at git.evergreen-ils.org
Wed May 25 16:50:48 EDT 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, rel_2_0 has been updated
via 51523ac6db6a4b78ca6053ab0df645698f017db8 (commit)
from fdc87c6c4214a09a3edc762b8a0f14ffa457870e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 51523ac6db6a4b78ca6053ab0df645698f017db8
Author: Jason Etheridge <jason at esilibrary.com>
Date: Wed May 25 16:56:24 2011 -0400
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 <jason at esilibrary.com>
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 5688f11..5871323 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/network.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/network.js
@@ -427,7 +427,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)
@@ -499,9 +499,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)
)
) {
-----------------------------------------------------------------------
Summary of changes:
.../staff_client/chrome/content/util/network.js | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list