From dd9087bfa184105b4277daeba252ca50b24ef63c Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Mon, 3 May 2021 10:34:08 -0400
Subject: [PATCH] LP1904036 Recent patrons fixes

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
---
 Open-ILS/src/eg2/src/app/staff/circ/patron/patron.service.ts    | 3 +--
 Open-ILS/src/eg2/src/app/staff/nav.component.html               | 2 +-
 Open-ILS/src/eg2/src/app/staff/share/patron/search.component.ts | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.service.ts b/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.service.ts
index 41940b68a0..db322644b4 100644
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.service.ts
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.service.ts
@@ -95,8 +95,7 @@ export class PatronContextService {
     addRecentPatron(): Promise<any> {
 
         return this.serverStore.getItem('ui.staff.max_recent_patrons')
-        .then(sets => {
-            const num = sets['ui.staff.max_recent_patrons'];
+        .then(num => {
             if (num) { this.maxRecentPatrons = num; }
 
             const patrons: number[] =
diff --git a/Open-ILS/src/eg2/src/app/staff/nav.component.html b/Open-ILS/src/eg2/src/app/staff/nav.component.html
index 6e73bd4948..b7afa93f66 100644
--- a/Open-ILS/src/eg2/src/app/staff/nav.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/nav.component.html
@@ -97,7 +97,7 @@
             <span class="material-icons" aria-hidden="true">redo</span>
             <span i18n>Retrieve Last Patron</span>
           </a>
-          <a class="dropdown-item" href="/eg/staff/circ/patron/search?show_recent=1">
+          <a class="dropdown-item" routerLink="/staff/circ/patron/search/recents">
             <span class="material-icons" aria-hidden="true">redo</span>
             <span i18n>Retrieve Recent Patrons</span>
           </a>
diff --git a/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.ts b/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.ts
index 8ca36a9aef..9e73b2818c 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.ts
@@ -165,9 +165,9 @@ export class PatronSearchComponent implements OnInit, AfterViewInit {
 
         let observable: Observable<IdlObject>;
 
-        if (this.patronIds) {
+        if (this.patronIds && !this.startWithFired) {
             observable = this.searchById(this.patronIds);
-            this.patronIds = null;
+            this.startWithFired = true;
         } else if (this.search.id) {
             observable = this.searchById([this.search.id]);
         } else {
-- 
2.11.0