[open-ils-commits] [GIT] Evergreen ILS branch rel_2_1 updated. 48b0d264027cebc93f5250b3eeca8624bd35d338

[Evergreen Git]

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_1 has been updated
       via  48b0d264027cebc93f5250b3eeca8624bd35d338 (commit)
      from  05b9ff4f842e6c51735a3ef8510f39791a5efd82 (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 48b0d264027cebc93f5250b3eeca8624bd35d338
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 5cba385..4fcca50 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) 
                         )
                     ) {

-----------------------------------------------------------------------

Summary of changes:
 .../staff_client/chrome/content/util/network.js    |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS