From e3757041a9648900d7e6d616d10fbb14cbe6f16c Mon Sep 17 00:00:00 2001 From: erickson Date: Wed, 25 Oct 2006 20:36:56 +0000 Subject: [PATCH] fixed bug which caused the user editor to alert errors on deleted addresses if the address data was invalid git-svn-id: svn://svn.open-ils.org/ILS/trunk@6511 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Evergreen/xul/staff_client/server/patron/ue.js | 9 ++++++--- Evergreen/xul/staff_client/server/patron/ue_config.js | 5 ++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Evergreen/xul/staff_client/server/patron/ue.js b/Evergreen/xul/staff_client/server/patron/ue.js index 610f6ad213..e9e30b6426 100644 --- a/Evergreen/xul/staff_client/server/patron/ue.js +++ b/Evergreen/xul/staff_client/server/patron/ue.js @@ -366,6 +366,7 @@ function uEditCheckValid(field) { removeCSSClass(field.widget.node, CSS_INVALID_DATA); } } + } /* find a field object by object key */ @@ -400,9 +401,11 @@ function uEditGetErrorStrings() { uEditIterateFields( function(field) { if(field.errkey) { - if( field.widget.node.className.indexOf(CSS_INVALID_DATA) != -1) { - var str = $(field.errkey).innerHTML; - if(str) errors.push(str); + if( !field.object.isdeleted() ) { + if( field.widget.node.className.indexOf(CSS_INVALID_DATA) != -1) { + var str = $(field.errkey).innerHTML; + if(str) errors.push(str); + } } } } diff --git a/Evergreen/xul/staff_client/server/patron/ue_config.js b/Evergreen/xul/staff_client/server/patron/ue_config.js index a0713399d7..1d6a3cc19a 100644 --- a/Evergreen/xul/staff_client/server/patron/ue_config.js +++ b/Evergreen/xul/staff_client/server/patron/ue_config.js @@ -637,7 +637,10 @@ function uEditBuildAddrFields(patron, address) { uEditCheckSharedAddr(patron, address, tbody, row); $n(row, 'ue_addr_delete').onclick = - function() { uEditDeleteAddr(tbody, row, address); } + function() { + uEditDeleteAddr(tbody, row, address); + uEditCheckErrors(); + }; if( patron.billing_address() && address.id() == patron.billing_address().id() ) -- 2.43.2