LP1904036 Rebase and lint repairs

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/catalog/hold/hold.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.ts
index 3bd0fad..9c72ae6 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.ts
@@ -19,7 +19,6 @@ import {PatronService} from '@eg/staff/share/patron/patron.service';
 import {PatronSearchDialogComponent
   } from '@eg/staff/share/patron/search-dialog.component';
 import {AlertDialogComponent} from '@eg/share/dialog/alert.component';
-    } from '@eg/staff/share/patron/search-dialog.component';
 import {BarcodeSelectComponent
     } from '@eg/staff/share/barcodes/barcode-select.component';
 import {WorkLogService} from '@eg/staff/share/worklog/worklog.service';

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 4deeb44..b7bcecd 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
@@ -1588,11 +1588,11 @@ export class EditComponent implements OnInit, AfterViewInit {
             // patron.card() is not the same in-memory object as its
             // analog in patron.cards().  Since we're about to replace
             // patron.card() anyway, just update the patron.cards() version.
-            const card = this.patron.cards()
+            const crd = this.patron.cards()
                 .filter(c => c.id() === this.patron.card().id())[0];
 
-            card.active('f');
-            card.ischanged(true);
+            crd.active('f');
+            crd.ischanged(true);
         }
 
         const card = this.idl.create('ac');