From 51ceaa6de2812bd70be4fbff5db9210fdfc9c658 Mon Sep 17 00:00:00 2001
From: Kyle Huckins <khuckins@catalyte.io>
Date: Thu, 21 Nov 2019 19:52:43 +0000
Subject: [PATCH] lp1839341 - Item Location Integration

- Integrate Item Location Selector for acpl-linked org
unit setting value editing in the Org Unit Setting Editor.

Signed-off-by: Kyle Huckins <khuckins@catalyte.io>

 Changes to be committed:
	modified:   Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/edit-org-unit-setting-dialog.component.html
	modified:   Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/edit-org-unit-setting-dialog.component.ts
	modified:   Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-settings.module.ts

Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: Jane Sandberg <sandbergja@gmail.com>
---
 .../org-unit-settings/edit-org-unit-setting-dialog.component.html  | 7 +++----
 .../org-unit-settings/edit-org-unit-setting-dialog.component.ts    | 2 --
 .../admin/local/org-unit-settings/org-unit-settings.module.ts      | 2 ++
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/edit-org-unit-setting-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/edit-org-unit-setting-dialog.component.html
index bed349ff12..eae497c787 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/edit-org-unit-setting-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/edit-org-unit-setting-dialog.component.html
@@ -119,10 +119,9 @@
                     <div class="input-group-text" i18n>Value</div>
                       <ng-container [ngSwitch]="entry.fmClass">
                         <ng-container *ngSwitchCase="'acpl'">
-                          <eg-combobox placeholder="Select a value" [idlClass]="entry.fmClass" idlField="name" idlIncludeLibraryInLabel="owning_lib"
-                            [asyncSupportsEmptyTermClick]="true" [displayTemplate]="fmClassLabel"
-                            (onChange)="setInputValue($event ? $event.id : null)">
-                          </eg-combobox>
+                          <eg-item-location-select [permFilter]="entry.view_perm"
+                            [contextOrgId]="entryContext" (valueChange)="setInputValue($event ? $event.id() : null)">
+                          </eg-item-location-select>
                         </ng-container>
                         <ng-container *ngSwitchDefault>
                           <eg-combobox placeholder="Select a value" [idlClass]="entry.fmClass" idlField="name"
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/edit-org-unit-setting-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/edit-org-unit-setting-dialog.component.ts
index ce2add0a8a..81f79fed41 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/edit-org-unit-setting-dialog.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/edit-org-unit-setting-dialog.component.ts
@@ -39,8 +39,6 @@ export class EditOuSettingDialogComponent extends DialogComponent {
     }
 
     setInputValue(inputValue) {
-        console.log("In Input value");
-        console.log(inputValue);
         this.entryValue = inputValue;
     }
 
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-settings.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-settings.module.ts
index 62ee75e096..dc3531a132 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-settings.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/org-unit-settings/org-unit-settings.module.ts
@@ -6,6 +6,7 @@ import {EditOuSettingDialogComponent} from './edit-org-unit-setting-dialog.compo
 import {OuSettingHistoryDialogComponent} from './org-unit-setting-history-dialog.component';
 import {OrgUnitSettingsRoutingModule} from './org-unit-settings-routing.module';
 import {OuSettingJsonDialogComponent} from './org-unit-setting-json-dialog.component';
+import {ItemLocationSelectModule} from '@eg/share/item-location-select/item-location-select.module';
 
 @NgModule({
     declarations: [
@@ -16,6 +17,7 @@ import {OuSettingJsonDialogComponent} from './org-unit-setting-json-dialog.compo
     ],
     imports: [
         AdminCommonModule,
+        ItemLocationSelectModule,
         OrgUnitSettingsRoutingModule,
         TreeModule
     ],
-- 
2.11.0