From 4c43a59ece3d17bfe0fb5c0cd75aec9b5aa5d551 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Tue, 9 Apr 2019 10:47:15 -0400
Subject: [PATCH] LPXXX Angular Permission group tree admin UI

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 .../app/staff/admin/server/perm-group-map-dialog.component.html    | 6 +++---
 .../src/app/staff/admin/server/perm-group-map-dialog.component.ts  | 2 +-
 .../eg2/src/app/staff/admin/server/perm-group-tree.component.html  | 7 ++++---
 .../eg2/src/app/staff/admin/server/perm-group-tree.component.ts    | 5 ++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-map-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-map-dialog.component.html
index fe1c26b157..46a6be79f9 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-map-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-map-dialog.component.html
@@ -23,9 +23,9 @@
     <div class="row mt-1 pt-1">
       <div class="col-lg-5" i18n>Depth</div>
       <div class="col-lg-7">
-        <eg-combobox [entries]="orgDepths" [startId]="0"
-          (onChange)="depth = $event ? $event.id : null">
-        </eg-combobox>
+        <select [(ngModel)]="depth" class="p-1">
+          <option *ngFor="let d of orgDepths" value="{{d}}">{{d}}</option>
+        </select>
       </div>
     </div>
     <div class="row mt-1 pt-1">
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-map-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-map-dialog.component.ts
index a1f8f953d1..4d3a861a8b 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-map-dialog.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-map-dialog.component.ts
@@ -24,7 +24,7 @@ export class PermGroupMapDialogComponent extends DialogComponent {
     // group or are linked to a parent group.
     @Input() permMaps: IdlObject[];
 
-    @Input() orgDepths: ComboboxEntry[];
+    @Input() orgDepths: number[];
 
     // Note we have all of the permissions on hand, but rendering the
     // full list of permissions can caus sluggishness.  Render async instead.
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-tree.component.html b/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-tree.component.html
index f552f6f702..3437f5c153 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-tree.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-tree.component.html
@@ -156,9 +156,10 @@
               <ng-template #nativeMap>
                 <div class="col-lg-4">{{map.grp().name()}}</div>
                 <div class="col-lg-1">
-                  <eg-combobox [entries]="orgDepths" [startId]="map.depth()"
-                    (onChange)="map.depth($event ? $event.id : null); map.ischanged(true)">
-                  </eg-combobox>
+                  <select [ngModel]="map.depth()" class="p-1"
+                    (ngModelChange)="map.depth($event); map.ischanged(true)">
+                    <option *ngFor="let d of orgDepths" value="{{d}}">{{d}}</option>
+                  </select>
                 </div>
                 <div class="col-lg-1 d-flex flex-column justify-content-center">
                   <div class="d-flex justify-content-center p-3 rounded border border-info">                
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-tree.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-tree.component.ts
index 16428a9980..766146151c 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-tree.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/perm-group-tree.component.ts
@@ -26,7 +26,7 @@ export class PermGroupTreeComponent implements OnInit {
     permIdMap: {[id: number]: IdlObject};
     permEntries: ComboboxEntry[];
     permMaps: IdlObject[];
-    orgDepths: ComboboxEntry[];
+    orgDepths: number[];
 
     // Have to fetch quite a bit of data for this UI.
     loading: boolean;
@@ -73,8 +73,7 @@ export class PermGroupTreeComponent implements OnInit {
                 depths2.push(d);
             }
         });
-
-        this.orgDepths = depths2.sort().map(d => ({id: d, label: '' + d}));
+        this.orgDepths = depths2.sort();
     }
 
     groupPermMaps(): IdlObject[] {
-- 
2.11.0