LP1837059 Basic admin page can propagate disableOrgFilter

[Evergreen.git] / Open-ILS / src / eg2 / src / app / staff / admin / basic-admin-page.component.ts

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/basic-admin-page.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/basic-admin-page.component.ts
index 908dadf..ceed287 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/basic-admin-page.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/basic-admin-page.component.ts
@@ -8,9 +8,13 @@ import {IdlService} from '@eg/core/idl.service';
 
 @Component({
     template: `
 
 @Component({
     template: `

+      <eg-title i18n-prefix prefix="{{classLabel}} Administration">
+      </eg-title>

       <eg-staff-banner bannerText="{{classLabel}} Configuration" i18n-bannerText>
       </eg-staff-banner>
       <eg-staff-banner bannerText="{{classLabel}} Configuration" i18n-bannerText>
       </eg-staff-banner>

-      <eg-admin-page persistKeyPfx="{{persistKeyPfx}}" idlClass="{{idlClass}}" readonlyFields="{{readonlyFields}}"></eg-admin-page>
+      <eg-admin-page persistKeyPfx="{{persistKeyPfx}}" idlClass="{{idlClass}}"
+        readonlyFields="{{readonlyFields}}"
+        [disableOrgFilter]="disableOrgFilter"></eg-admin-page>

     `
 })
 
     `
 })
 


@@ -21,6 +25,9 @@ export class BasicAdminPageComponent implements OnInit {
     persistKeyPfx: string;
     readonlyFields = '';
 
     persistKeyPfx: string;
     readonlyFields = '';
 

+    // Tell the admin page to disable and hide the automagic org unit filter
+    disableOrgFilter: boolean;
+

     constructor(
         private route: ActivatedRoute,
         private idl: IdlService
     constructor(
         private route: ActivatedRoute,
         private idl: IdlService


@@ -41,21 +48,32 @@ export class BasicAdminPageComponent implements OnInit {
         }
         const fullTable = schema + '.' + table;
 
         }
         const fullTable = schema + '.' + table;
 

-

         // Set the prefix to "server", "local", "workstation",
         // extracted from the URL path.
         // Set the prefix to "server", "local", "workstation",
         // extracted from the URL path.

+        // For admin pages that use none of these, avoid setting
+        // the prefix because that will cause it to double-up.
+        // e.g. eg.grid.acq.acq.cancel_reason

         this.persistKeyPfx = this.route.snapshot.parent.url[0].path;
         this.persistKeyPfx = this.route.snapshot.parent.url[0].path;

-        if (this.persistKeyPfx === 'acq') {
-            // ACQ is a special case, becaus unlike 'server', 'local',
+        const selfPrefixers = ['acq', 'booking'];
+        if (selfPrefixers.indexOf(this.persistKeyPfx) > -1) {
+            // ACQ is a special case, because unlike 'server', 'local',

             // 'workstation', the schema ('acq') is the root of the path.
             this.persistKeyPfx = '';
         }
 
         // Pass the readonlyFields param if available
             // 'workstation', the schema ('acq') is the root of the path.
             this.persistKeyPfx = '';
         }
 
         // Pass the readonlyFields param if available

-        if (this.route.snapshot.data[0].readonlyFields) {
-            this.readonlyFields = this.route.snapshot.data[0].readonlyFields;
-        }
+        if (this.route.snapshot.data && this.route.snapshot.data[0]) {
+            // snapshot.data is a HASH.
+            const data = this.route.snapshot.data[0];

 
 

+            if (data.readonlyFields) {
+                this.readonlyFields = data.readonlyFields;
+            }
+
+            if (data.disableOrgFilter) {
+                this.disableOrgFilter = true;
+            }
+        }

 
         Object.keys(this.idl.classes).forEach(class_ => {
             const classDef = this.idl.classes[class_];
 
         Object.keys(this.idl.classes).forEach(class_ => {
             const classDef = this.idl.classes[class_];