From 0c37d930e8a4815f03ba4159b6be5fefcee7cfb4 Mon Sep 17 00:00:00 2001 From: erickson Date: Mon, 31 Jul 2006 17:54:39 +0000 Subject: [PATCH] added some sanity checks git-svn-id: svn://svn.open-ils.org/ILS/trunk@5187 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/xul/staff_client/server/patron/ue.js | 13 +++++-------- Open-ILS/xul/staff_client/server/patron/ue_config.js | 6 ++++-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Open-ILS/xul/staff_client/server/patron/ue.js b/Open-ILS/xul/staff_client/server/patron/ue.js index 98fb299163..862399c550 100644 --- a/Open-ILS/xul/staff_client/server/patron/ue.js +++ b/Open-ILS/xul/staff_client/server/patron/ue.js @@ -156,9 +156,11 @@ function uEditClone(clone) { for( var a in cloneUser.addresses() ) { var addr = cloneUser.addresses()[a]; - if( addr.id() == cloneUser.mailing_address().id() ) + if( cloneUser.mailing_address && + addr.id() == cloneUser.mailing_address().id() ) patron.mailing_address(addr); - if( addr.id() == cloneUser.billing_address().id() ) + if( cloneUser.billing_address() && + addr.id() == cloneUser.billing_address().id() ) patron.billing_address(addr); patron.addresses().push(addr); } @@ -227,6 +229,7 @@ function uEditActivateField(field) { } field.widget.node.disabled = field.widget.disabled; + if(field.object == null) return; var val = field.object[field.key](); if(val == null) return; @@ -242,12 +245,6 @@ function uEditActivateField(field) { if( field.widget.onload ) field.widget.onload(val); - - /* - alert(field.key); - if(field.key == 'ident_value') alert(field.widget.onblur); - */ - } diff --git a/Open-ILS/xul/staff_client/server/patron/ue_config.js b/Open-ILS/xul/staff_client/server/patron/ue_config.js index 6cfe559a6f..cf6312234d 100644 --- a/Open-ILS/xul/staff_client/server/patron/ue_config.js +++ b/Open-ILS/xul/staff_client/server/patron/ue_config.js @@ -585,10 +585,12 @@ function uEditBuildAddrFields(patron, address) { $n(row, 'ue_addr_delete').onclick = function() { uEditDeleteAddr(tbody, row, address); } - if( address.id() == patron.billing_address().id() ) + if( patron.billing_address() && + address.id() == patron.billing_address().id() ) $n(row, 'ue_addr_billing_yes').checked = true; - if( address.id() == patron.mailing_address().id() ) + if( patron.mailing_address() && + address.id() == patron.mailing_address().id() ) $n(row, 'ue_addr_mailing_yes').checked = true; $n(row, 'ue_addr_billing_yes').setAttribute('address', address.id()); -- 2.11.0