From 253302317217678de35a5659d3d941e5fca22eab Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Thu, 31 May 2018 16:53:19 -0400
Subject: [PATCH] LP#1775466 More admin UI and entries

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 .../server/admin-server-splash.component.html      | 32 +++++++++++-----------
 .../share/admin-page/admin-page.component.html     |  8 ++++--
 .../staff/share/admin-page/admin-page.component.ts | 10 +++++++
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/admin-server-splash.component.html b/Open-ILS/src/eg2/src/app/staff/admin/server/admin-server-splash.component.html
index 7597cd13c4..5e6058da9c 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/admin-server-splash.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/admin-server-splash.component.html
@@ -52,29 +52,29 @@
     <eg-link-table-link i18n-label label="Hold Matchpoint Weights"  
       routerLink="/staff/admin/server/config/hold_matrix_weights"></eg-link-table-link>
     <eg-link-table-link i18n-label label="Import Match Sets"  
-      url="/eg/staff/admin/server/vandelay/match_set"></eg-link-table-link>
+      routerLink="/staff/admin/server/vandelay/match_set"></eg-link-table-link>
     <eg-link-table-link i18n-label label="MARC Coded Value Maps"  
-      url="/eg/staff/admin/server/config/coded_value_map"></eg-link-table-link>
+      routerLink="/staff/admin/server/config/coded_value_map"></eg-link-table-link>
     <eg-link-table-link i18n-label label="MARC Import Remove Fields"  
-      url="/eg/staff/admin/server/vandelay/import_bib_trash_group"></eg-link-table-link>
+      routerLink="/staff/admin/server/vandelay/import_bib_trash_group"></eg-link-table-link>
     <eg-link-table-link i18n-label label="MARC Record Attributes"  
-      url="/eg/staff/admin/server/config/record_attr_definition"></eg-link-table-link>
+      routerLink="/staff/admin/server/config/record_attr_definition"></eg-link-table-link>
     <eg-link-table-link i18n-label label="MARC Search/Facet Class FTS Maps"  
-      url="/eg/staff/admin/server/config/metabib_class_ts_map"></eg-link-table-link>
+      routerLink="/staff/admin/server/config/metabib_class_ts_map"></eg-link-table-link>
     <eg-link-table-link i18n-label label="MARC Search/Facet Classes"  
-      url="/eg/staff/admin/server/config/metabib_class"></eg-link-table-link>
+      routerLink="/staff/admin/server/config/metabib_class"></eg-link-table-link>
     <eg-link-table-link i18n-label label="MARC Search/Facet Field FTS Maps"  
-      url="/eg/staff/admin/server/config/metabib_field_ts_map"></eg-link-table-link>
+      routerLink="/staff/admin/server/config/metabib_field_ts_map"></eg-link-table-link>
     <eg-link-table-link i18n-label label="MARC Search/Facet Fields"  
-      url="/eg/staff/admin/server/config/metabib_field"></eg-link-table-link>
+      routerLink="/staff/admin/server/config/metabib_field"></eg-link-table-link>
     <eg-link-table-link i18n-label label="MARC Tag Tables"  
-      url="/eg/staff/admin/server/config/marc_field"></eg-link-table-link>
+      routerLink="/staff/admin/server/config/marc_field"></eg-link-table-link>
     <eg-link-table-link i18n-label label="Org Unit Proximity Adjustments"  
-      url="/eg/staff/admin/server/config/org_unit_proximity_adjustment"></eg-link-table-link>
+      routerLink="/staff/admin/server/actor/org_unit_proximity_adjustment"></eg-link-table-link>
     <eg-link-table-link i18n-label label="Organization Types"  
       url="/eg/staff/admin/server/legacy/actor/org_unit_type"></eg-link-table-link>
     <eg-link-table-link i18n-label label="Org Unit Setting Types"  
-      url="/eg/staff/admin/server/config/org_unit_setting_type"></eg-link-table-link>
+      routerLink="/staff/admin/server/config/org_unit_setting_type"></eg-link-table-link>
     <eg-link-table-link i18n-label label="Organizational Units"  
       url="/eg/staff/admin/server/legacy/actor/org_unit"></eg-link-table-link>
     <eg-link-table-link i18n-label label="Permission Groups"  
@@ -86,14 +86,14 @@
     <eg-link-table-link i18n-label label="SMS Carriers"  
       routerLink="/staff/admin/server/config/sms_carrier"></eg-link-table-link>
     <eg-link-table-link i18n-label label="User Activity Types"  
-      url="/eg/staff/admin/server/config/usr_activity_type"></eg-link-table-link>
+      routerLink="/staff/admin/server/config/usr_activity_type"></eg-link-table-link>
     <eg-link-table-link i18n-label label="User Setting Types"  
-      url="/eg/staff/admin/server/config/usr_setting_type"></eg-link-table-link>
+      routerLink="/staff/admin/server/config/usr_setting_type"></eg-link-table-link>
     <eg-link-table-link i18n-label label="Weights Association"  
-      url="/eg/staff/admin/server/config/weight_assoc"></eg-link-table-link>
+      routerLink="/staff/admin/server/config/weight_assoc"></eg-link-table-link>
     <eg-link-table-link i18n-label label="Z39.50 Index Field Maps"  
-      url="/eg/staff/admin/server/config/z3950_index_field_map"></eg-link-table-link>
+      routerLink="/staff/admin/server/config/z3950_index_field_map"></eg-link-table-link>
     <eg-link-table-link i18n-label label="Z39.50 Servers"  
-      url="/eg/staff/admin/server/config/z3950_source"></eg-link-table-link>
+      routerLink="/staff/admin/server/config/z3950_source"></eg-link-table-link>
   </eg-link-table>
 </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/share/admin-page/admin-page.component.html b/Open-ILS/src/eg2/src/app/staff/share/admin-page/admin-page.component.html
index 1480593c61..9c9c7ed639 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/admin-page/admin-page.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/admin-page/admin-page.component.html
@@ -19,12 +19,16 @@
     </div>
     <div class="pl-2">
       <div class="form-check">
-        <input type="checkbox" (click)="grid.reload()" [(ngModel)]="includeOrgAncestors"
+        <input type="checkbox" (click)="grid.reload()" 
+          [disabled]="disableAncestorSelector()"
+          [(ngModel)]="includeOrgAncestors"
           class="form-check-input" id="include-ancestors">
         <label class="form-check-label" for="include-ancestors" i18n>+ Ancestors</label>
       </div>
       <div class="form-check">
-        <input type="checkbox" (click)="grid.reload()" [(ngModel)]="includeOrgDescendants" 
+        <input type="checkbox" (click)="grid.reload()" 
+          [disabled]="disableDescendantSelector()"
+          [(ngModel)]="includeOrgDescendants" 
           class="form-check-input" id="include-descendants">
         <label class="form-check-label" for="include-descendants" i18n>+ Descendants</label>
       </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/share/admin-page/admin-page.component.ts b/Open-ILS/src/eg2/src/app/staff/share/admin-page/admin-page.component.ts
index a9b4fccd2f..be28ac9081 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/admin-page/admin-page.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/share/admin-page/admin-page.component.ts
@@ -196,6 +196,16 @@ export class EgAdminPageComponent implements OnInit {
             return this.pcrud.retrieveAll(this.idlClass, searchOps);
         };
     }
+
+    disableAncestorSelector(): boolean {
+        return this.contextOrg &&
+            this.contextOrg.id() === this.org.root().id();
+    }
+
+    disableDescendantSelector(): boolean {
+        return this.contextOrg && this.contextOrg.children().length === 0;
+    }
+
 }
 
 
-- 
2.11.0