From d6b91568101744d03c30e09a7d897c32cecbdaae Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Sun, 28 Mar 2021 15:58:14 -0400
Subject: [PATCH] funds: tweak use of ngIf to ensure stale data isn't displayed

(upon opening the fund details modal multiple times for different
 funds during a page session)

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---
 .../admin/acq/funds/fund-details-dialog.component.html   | 16 ++++++++--------
 .../admin/acq/funds/fund-details-dialog.component.ts     |  1 +
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.html
index 566a1754d2..a2f30b86c7 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.html
@@ -12,14 +12,14 @@
   </div>
 </ng-template>
 <ng-template #dialogContent>
-  <div class="modal-header bg-info" *ngIf="fund">
-    <h3 class="modal-title" i18n>Fund Details - {{fund.name()}} ({{fund.code()}} {{fund.year()}})</h3>
+  <div class="modal-header bg-info">
+    <h3 class="modal-title" i18n>Fund Details - {{fund?.name()}} ({{fund?.code()}} {{fund?.year()}})</h3>
     <button type="button" class="close"
       i18n-aria-label aria-label="Close" (click)="close()">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>
-  <div class="modal-body" *ngIf="fund">
+  <div class="modal-body">
     <div class="row mt-3">
       <div class="col-lg-12 text-right pb-1">
         <button class="btn btn-secondary btn-sm" [disabled]="activeTab == defaultTabType"
@@ -27,7 +27,7 @@
       </div>
     </div>
     <ul ngbNav #fundDetailsNav="ngbNav" [(activeId)]="activeTab" class="nav-tabs">
-      <li [ngbNavItem]="'summary'">
+      <li [ngbNavItem]="'summary'" *ngIf="fund">
         <a ngbNavLink i18n>Summary</a>
         <ng-template ngbNavContent>
           <div class="mt-2">
@@ -61,7 +61,7 @@
           </div>
         </ng-template>
       </li>
-      <li [ngbNavItem]="'allocations'">
+      <li [ngbNavItem]="'allocations'" *ngIf="fund">
         <a ngbNavLink i18n>Allocations</a>
         <ng-template ngbNavContent>
           <div class="mt-2">
@@ -80,7 +80,7 @@
           </div>
         </ng-template>
       </li>
-      <li [ngbNavItem]="'transfers'">
+      <li [ngbNavItem]="'transfers'" *ngIf="fund">
         <a ngbNavLink i18n>Transfers</a>
         <ng-template ngbNavContent>
           <div class="mt-2">
@@ -100,7 +100,7 @@
            </div>
         </ng-template>
       </li>
-      <li [ngbNavItem]="'debits'">
+      <li [ngbNavItem]="'debits'" *ngIf="fund">
         <a ngbNavLink i18n>Debits</a>
         <ng-template ngbNavContent>
           <div class="mt-2">
@@ -121,7 +121,7 @@
            </div>
         </ng-template>
       </li>
-      <li [ngbNavItem]="'tags'">
+      <li [ngbNavItem]="'tags'" *ngIf="fund">
         <a ngbNavLink i18n>Tags</a>
         <ng-template ngbNavContent>
           <div class="mt-2">
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.ts
index 7eaf254e62..f1cca336c2 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.ts
@@ -64,6 +64,7 @@ export class FundDetailsDialogComponent
     }
 
     private _initRecord() {
+        this.fund = null;
         this.acqfaDataSource = this._getDataSource('acqfa', 'create_time ASC');
         this.acqftrDataSource = this._getDataSource('acqftr', 'transfer_time ASC');
         this.acqfdebDataSource = this._getDataSource('acqfdeb', 'create_time ASC');
-- 
2.11.0