LP1904036 Sanity check missing mailing/billing addresses

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/edit-toolbar.component.ts b/Open-ILS/src/eg2/src/app/staff/circ/patron/edit-toolbar.component.ts
index f67751f..a72cf7d 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/edit-toolbar.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/edit-toolbar.component.ts
@@ -87,9 +87,12 @@ export class EditToolbarComponent implements OnInit {
 
     checkAddressAlerts(patron: IdlObject, addr: IdlObject) {
         const addrHash = this.idl.toHash(addr);
-        console.log('CHECKING ADDR', addrHash);
-        addrHash.mailing_address = addr.id() === patron.mailing_address().id();
-        addrHash.billing_address = addr.id() === patron.billing_address().id();
+        if (patron.mailing_address()) {
+            addrHash.mailing_address = addr.id() === patron.mailing_address().id();
+        }
+        if (patron.billing_address()) {
+            addrHash.billing_address = addr.id() === patron.billing_address().id();
+        }
         this.net.request(
             'open-ils.actor',
             'open-ils.actor.address_alert.test',

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/edit.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/edit.component.html
index 2e5f24d..d916f4e 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/edit.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/edit.component.html
@@ -665,7 +665,7 @@
           <div class="form-check form-check-inline mr-2">
             <input class="form-check-input" type="checkbox" 
               name="addr-{{addr.id()}}-mailing" id="addr-{{addr.id()}}-mailing" 
-              [ngModel]="addr.id() == patron.mailing_address().id()"
+              [ngModel]="patron.mailing_address() && addr.id() == patron.mailing_address().id()"
               (ngModelChange)="setAddrType('mailing', addr, $event)"/>
             <label class="form-check-label" 
               for="addr-{{addr.id()}}-mailing" i18n>Mailing</label>
@@ -673,7 +673,7 @@
           <div class="form-check form-check-inline mr-2">
             <input class="form-check-input" type="checkbox" 
               name="addr-{{addr.id()}}-billing" id="addr-{{addr.id()}}-billing" 
-              [ngModel]="addr.id() == patron.billing_address().id()"
+              [ngModel]="patron.billing_address() && addr.id() == patron.billing_address().id()"
               (ngModelChange)="setAddrType('billing', addr, $event)"/>
             <label class="form-check-label" 
               for="addr-{{addr.id()}}-billing" i18n>Physical</label>

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/edit.component.ts b/Open-ILS/src/eg2/src/app/staff/circ/patron/edit.component.ts
index 373a6d8..1ebfd9d 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/edit.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/edit.component.ts
@@ -1316,11 +1316,13 @@ export class EditComponent implements OnInit, AfterViewInit {
 
             // Roll the mailing/billing designation to another
             // address when needed.
-            if (this.patron.mailing_address().id() === addr.id()) {
+            if (this.patron.mailing_address() &&
+                this.patron.mailing_address().id() === addr.id()) {
                 this.setAddrType('mailing', addr, false);
             }
 
-            if (this.patron.billing_address().id() === addr.id()) {
+            if (this.patron.billing_address() &&
+                this.patron.billing_address().id() === addr.id()) {
                 this.setAddrType('billing', addr, false);
             }