[open-ils-commits] [GIT] Evergreen ILS branch master updated. de9179216d01b2b3a7855846da2cfa00671863d6

[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, master has been updated
       via  de9179216d01b2b3a7855846da2cfa00671863d6 (commit)
      from  c304ebb52b8249278b54d32efcfee86d779be48d (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 de9179216d01b2b3a7855846da2cfa00671863d6
Author: Liam Whalen <whalen.ld at gmail.com>
Date:   Sat Feb 14 00:25:05 2015 -0800

    LP#1282286 Tab is NULL error
    
    When editing a MARC record in Vandelay or MFHD holdings in a popup XUL
    WIndow, a tab is NULL error is presented to the user.
    
    This happens because an undefined variable is being used when it should
    not be.  This code adds a check for that variable to ensure it exists
    before using it.  The variable used only matters in cases where tabs are
    present, which is not the case with pop up MARC edit windows, so
    ignoring the variable in these cases is fine.
    
    Signed-off-by: Liam Whalen <liam.whalen at bc.libraries.coop>
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

diff --git a/Open-ILS/xul/staff_client/server/cat/marcedit.js b/Open-ILS/xul/staff_client/server/cat/marcedit.js
index 0a9bf03..05ce1c4 100644
--- a/Open-ILS/xul/staff_client/server/cat/marcedit.js
+++ b/Open-ILS/xul/staff_client/server/cat/marcedit.js
@@ -604,7 +604,9 @@ function set_lock_on_keypress(ev) {
                 || ev.keyCode == ev.DOM_VK_F24
         )) {
             var params = {};
-            params.allow_multiple_locks = tab.marc_edit_allow_multiple_locks;
+            if (tab) {
+                params.allow_multiple_locks = tab.marc_edit_allow_multiple_locks;
+            }
             oils_lock_page(params);
         }
     } catch(E) {
@@ -1370,8 +1372,10 @@ function loadRecord() {
             if (tabs) {
                 var idx = tabs.selectedIndex;
                 var tab = tabs.childNodes[idx];
-                tab.marc_edit_changed = false;
-                tab.marc_edit_allow_multiple_locks = true;
+                if (tab) {
+                    tab.marc_edit_changed = false;
+                    tab.marc_edit_allow_multiple_locks = true;
+                }
             }
 
             var grid_rows = document.getElementById('recGrid').lastChild;

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

Summary of changes:
 Open-ILS/xul/staff_client/server/cat/marcedit.js |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS