fixed some logic errors in address summary display

git-svn-id: svn://svn.open-ils.org/ILS/trunk@5388 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/xul/staff_client/server/patron/ue.js b/Open-ILS/xul/staff_client/server/patron/ue.js
index 3fab888..f79c80a 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/ue.js
+++ b/Open-ILS/xul/staff_client/server/patron/ue.js
@@ -208,16 +208,23 @@ function uEditClone(clone) {
 var uEditVirtualAddrId = -1;
 function uEditCreateNewAddr() {
        var addr = new aua();
+
        addr.id(uEditVirtualAddrId--);
        addr.isnew(1);
        addr.usr(patron.id());
        addr.country(defaultCountry);
+
        if(!patron.addresses()) 
                patron.addresses([]);
+
        if(patron.addresses().length == 0) {
                patron.mailing_address(addr);
                patron.billing_address(addr);
        }
+
+       addr.valid(1);
+       addr.within_city_limits(1);
+
        uEditBuildAddrFields(patron, addr);
        patron.addresses().push(addr);
        uEditIterateFields(function(f) { uEditCheckValid(f); });

diff --git a/Open-ILS/xul/staff_client/server/patron/ue_ui.js b/Open-ILS/xul/staff_client/server/patron/ue_ui.js
index d6c2374..b1e6b37 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/ue_ui.js
+++ b/Open-ILS/xul/staff_client/server/patron/ue_ui.js
@@ -369,14 +369,18 @@ function uEditFleshSummaryAddr( address, patron, row ) {
        $n(row, 'state').appendChild(text(address.state()));
        $n(row, 'country').appendChild(text(address.country()));
        $n(row, 'zip').appendChild(text(address.post_code()));
-       $n(row, 'valid').appendChild(text( (address.valid()) ? yes : no ));
-       $n(row, 'incorporated').appendChild(text( (address.within_city_limits()) ? yes : no ));
-
-       $n(row, 'mailing').appendChild(text( 
-               (patron.mailing_address() == address.id()) ? yes : no ));
-
-       $n(row, 'billing').appendChild(text( 
-               (patron.billing_address() == address.id()) ? yes : no ));
+       $n(row, 'valid').appendChild(text( (isTrue(address.valid())) ? yes : no ));
+       $n(row, 'incorporated').appendChild(text( (isTrue(address.within_city_limits())) ? yes : no ));
+
+       var mid = patron.mailing_address();
+       if( typeof patron.mailing_address() == 'object' ) 
+               mid = patron.mailing_address().id();
+       $n(row, 'mailing').appendChild(text((mid == address.id()) ? yes : no ));
+
+       var bid = patron.billing_address();
+       if( typeof patron.billing_address() == 'object' ) 
+               bid = patron.billing_address().id();
+       $n(row, 'billing').appendChild(text((bid == address.id()) ? yes : no ));
 }