From 96a84220cdda4a9eeecee56554cc9d3729502277 Mon Sep 17 00:00:00 2001
From: Jane Sandberg <sandbej@linnbenton.edu>
Date: Sun, 7 Apr 2019 08:52:49 -0700
Subject: [PATCH] LP1816475: fixed default values for fmeditor

Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
---
 .../eg2/src/app/staff/booking/create-reservation.component.html  | 9 ++++++---
 .../eg2/src/app/staff/booking/create-reservation.component.ts    | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/booking/create-reservation.component.html b/Open-ILS/src/eg2/src/app/staff/booking/create-reservation.component.html
index 1c667e87b8..f1c2aac735 100644
--- a/Open-ILS/src/eg2/src/app/staff/booking/create-reservation.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/booking/create-reservation.component.html
@@ -160,13 +160,16 @@
     </ul>
   </ng-container>
 </ng-template>
-<ng-template #patronTemplate let-patronId="patronId">
-  <input *ngIf="patronId" type="text" disabled value="{{patronId}}" class="form-control" name="usr" (beforeSave$)="record['usr'] = patronId">
+<ng-template #patronTemplate let-record="record" let-patronId="patronId">
+<input type="hidden" value="{{record.request_lib(auth.user().ws_ou())}}">
+  <ng-container *ngIf="patronId">
+    <input *ngIf="patronId" type="text" disabled value="{{record.usr(patronId)}}" class="form-control" name="usr">
+  </ng-container>
   <div *ngIf="!patronId" class="input-group flex-nowrap">
     <div class="input-group-prepend">
       <label class="input-group-text" for="patron-barcode" i18n>Patron barcode</label>
       <input type="text" id="patron-barcode" class="form-control" i18n-placeholder placeholder="Patron barcode" [(ngModel)]="patronBarcode" (change)="findPatronByBarcode()">
-      <input type="hidden" value="{{patronId}}" name="usr" (beforeSave$)="record['usr'] = patronId">
     </div>
   </div>
 </ng-template>
+
diff --git a/Open-ILS/src/eg2/src/app/staff/booking/create-reservation.component.ts b/Open-ILS/src/eg2/src/app/staff/booking/create-reservation.component.ts
index ad69ad51ba..e96781ab70 100644
--- a/Open-ILS/src/eg2/src/app/staff/booking/create-reservation.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/booking/create-reservation.component.ts
@@ -193,7 +193,7 @@ export class CreateReservationComponent implements OnInit, AfterViewInit {
         this.findPatronByBarcode = () => {
             if (this.patronBarcode) {
                 this.patron.bcSearch(this.patronBarcode).pipe(single()).subscribe(
-                    resp => { this.patronId = resp[0].id; },
+                    resp => { this.newDialog.record.usr(resp[0].id); },
                     err => { this.toast.danger('No patron found with this barcode'); },
                 );
             }
-- 
2.11.0