From c4ee334688067936ac8e01a15c16d83629acc7e3 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Thu, 12 Jul 2018 12:10:05 -0400
Subject: [PATCH] LP#1775466 Import grid/basic admin in staff common mod

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 Open-ILS/src/eg2/src/app/staff/admin/common.module.ts    | 10 ++--------
 Open-ILS/src/eg2/src/app/staff/catalog/catalog.module.ts |  2 --
 Open-ILS/src/eg2/src/app/staff/common.module.ts          | 12 +++++++++---
 Open-ILS/src/eg2/src/app/staff/sandbox/sandbox.module.ts |  2 --
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/common.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/common.module.ts
index 48a63d14c4..5bd71d3efb 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/common.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/common.module.ts
@@ -1,28 +1,22 @@
 import {NgModule} from '@angular/core';
 import {StaffCommonModule} from '@eg/staff/common.module';
 import {LinkTableComponent, LinkTableLinkComponent} from '@eg/staff/share/link-table/link-table.component';
-import {GridModule} from '@eg/share/grid/grid.module';
-import {AdminPageComponent} from '@eg/staff/share/admin-page/admin-page.component';
 import {BasicAdminPageComponent} from '@eg/staff/admin/basic-admin-page.component';
 
 @NgModule({
   declarations: [
     LinkTableComponent,
     LinkTableLinkComponent,
-    AdminPageComponent,
     BasicAdminPageComponent
   ],
   imports: [
-    StaffCommonModule,
-    GridModule
+    StaffCommonModule
   ],
   exports: [
     StaffCommonModule,
     LinkTableComponent,
     LinkTableLinkComponent,
-    AdminPageComponent,
-    BasicAdminPageComponent,
-    GridModule
+    BasicAdminPageComponent
   ],
   providers: [
   ]
diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/catalog.module.ts b/Open-ILS/src/eg2/src/app/staff/catalog/catalog.module.ts
index 15faf0bc00..20e17a091c 100644
--- a/Open-ILS/src/eg2/src/app/staff/catalog/catalog.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/catalog.module.ts
@@ -1,6 +1,5 @@
 import {NgModule} from '@angular/core';
 import {StaffCommonModule} from '@eg/staff/common.module';
-import {GridModule} from '@eg/share/grid/grid.module';
 import {CatalogCommonModule} from '@eg/share/catalog/catalog-common.module';
 import {CatalogRoutingModule} from './routing.module';
 import {CatalogComponent} from './catalog.component';
@@ -31,7 +30,6 @@ import {HoldingsService} from '@eg/staff/share/holdings.service';
   ],
   imports: [
     StaffCommonModule,
-    GridModule,
     CatalogCommonModule,
     CatalogRoutingModule
   ],
diff --git a/Open-ILS/src/eg2/src/app/staff/common.module.ts b/Open-ILS/src/eg2/src/app/staff/common.module.ts
index ec4ca30fa5..6780b81a2b 100644
--- a/Open-ILS/src/eg2/src/app/staff/common.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/common.module.ts
@@ -1,6 +1,7 @@
 import {NgModule, ModuleWithProviders} from '@angular/core';
 import {EgCommonModule} from '@eg/common.module';
 import {AudioService} from '@eg/share/util/audio.service';
+import {GridModule} from '@eg/share/grid/grid.module';
 import {StaffBannerComponent} from './share/staff-banner.component';
 import {ComboboxComponent} from '@eg/share/combobox/combobox.component';
 import {ComboboxEntryComponent} from '@eg/share/combobox/combobox-entry.component';
@@ -17,6 +18,7 @@ import {FmRecordEditorComponent} from '@eg/share/fm-editor/fm-editor.component';
 import {DateSelectComponent} from '@eg/share/date-select/date-select.component';
 import {RecordBucketDialogComponent} from '@eg/staff/share/buckets/record-bucket-dialog.component';
 import {BibSummaryComponent} from '@eg/staff/share/bib-summary/bib-summary.component';
+import {AdminPageComponent} from '@eg/staff/share/admin-page/admin-page.component';
 
 /**
  * Imports the EG common modules and adds modules common to all staff UI's.
@@ -36,13 +38,16 @@ import {BibSummaryComponent} from '@eg/staff/share/bib-summary/bib-summary.compo
     FmRecordEditorComponent,
     DateSelectComponent,
     RecordBucketDialogComponent,
-    BibSummaryComponent
+    BibSummaryComponent,
+    AdminPageComponent
   ],
   imports: [
-    EgCommonModule
+    EgCommonModule,
+    GridModule
   ],
   exports: [
     EgCommonModule,
+    GridModule,
     StaffBannerComponent,
     ComboboxComponent,
     ComboboxEntryComponent,
@@ -55,7 +60,8 @@ import {BibSummaryComponent} from '@eg/staff/share/bib-summary/bib-summary.compo
     FmRecordEditorComponent,
     DateSelectComponent,
     RecordBucketDialogComponent,
-    BibSummaryComponent
+    BibSummaryComponent,
+    AdminPageComponent
   ]
 })
 
diff --git a/Open-ILS/src/eg2/src/app/staff/sandbox/sandbox.module.ts b/Open-ILS/src/eg2/src/app/staff/sandbox/sandbox.module.ts
index 00c7cb7516..58910dddbb 100644
--- a/Open-ILS/src/eg2/src/app/staff/sandbox/sandbox.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/sandbox/sandbox.module.ts
@@ -2,7 +2,6 @@ import {NgModule} from '@angular/core';
 import {StaffCommonModule} from '@eg/staff/common.module';
 import {SandboxRoutingModule} from './routing.module';
 import {SandboxComponent} from './sandbox.component';
-import {GridModule} from '@eg/share/grid/grid.module';
 
 @NgModule({
   declarations: [
@@ -11,7 +10,6 @@ import {GridModule} from '@eg/share/grid/grid.module';
   imports: [
     StaffCommonModule,
     SandboxRoutingModule,
-    GridModule
   ],
   providers: [
   ]
-- 
2.11.0