From f1bbbd7b73fe59d8b45c12a45ebeea9c904deed6 Mon Sep 17 00:00:00 2001
From: Kyle Huckins <khuckins@catalyte.io>
Date: Mon, 25 Nov 2019 18:46:59 +0000
Subject: [PATCH] lp1849212 Move Course Reserves to Local Admin

- Move the Course Reserves admin UI to Local Admin
instead of Server Admin

Signed-off-by: Kyle Huckins <khuckins@catalyte.io>
Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>

	modified:   Open-ILS/src/eg2/src/app/staff/admin/local/admin-local-splash.component.html
	renamed:    Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-associate-material.component.html -> Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.html
	renamed:    Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-associate-material.component.ts -> Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.ts
	renamed:    Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-list.component.html -> Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.html
	renamed:    Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-list.component.ts -> Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.ts
	renamed:    Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-reserves.module.ts -> Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-reserves.module.ts
	renamed:    Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course.service.ts -> Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course.service.ts
	renamed:    Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/routing.module.ts -> Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/routing.module.ts
	modified:   Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts
	modified:   Open-ILS/src/eg2/src/app/staff/admin/server/admin-server-splash.component.html
	modified:   Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts

Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---
 .../eg2/src/app/staff/admin/local/admin-local-splash.component.html    | 2 ++
 .../course-reserves/course-associate-material.component.html           | 0
 .../course-reserves/course-associate-material.component.ts             | 0
 .../admin/{server => local}/course-reserves/course-list.component.html | 0
 .../admin/{server => local}/course-reserves/course-list.component.ts   | 0
 .../admin/{server => local}/course-reserves/course-reserves.module.ts  | 0
 .../staff/admin/{server => local}/course-reserves/course.service.ts    | 0
 .../staff/admin/{server => local}/course-reserves/routing.module.ts    | 0
 Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts           | 3 +++
 .../eg2/src/app/staff/admin/server/admin-server-splash.component.html  | 2 --
 Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts          | 3 ---
 11 files changed, 5 insertions(+), 5 deletions(-)
 rename Open-ILS/src/eg2/src/app/staff/admin/{server => local}/course-reserves/course-associate-material.component.html (100%)
 rename Open-ILS/src/eg2/src/app/staff/admin/{server => local}/course-reserves/course-associate-material.component.ts (100%)
 rename Open-ILS/src/eg2/src/app/staff/admin/{server => local}/course-reserves/course-list.component.html (100%)
 rename Open-ILS/src/eg2/src/app/staff/admin/{server => local}/course-reserves/course-list.component.ts (100%)
 rename Open-ILS/src/eg2/src/app/staff/admin/{server => local}/course-reserves/course-reserves.module.ts (100%)
 rename Open-ILS/src/eg2/src/app/staff/admin/{server => local}/course-reserves/course.service.ts (100%)
 rename Open-ILS/src/eg2/src/app/staff/admin/{server => local}/course-reserves/routing.module.ts (100%)

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/admin-local-splash.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/admin-local-splash.component.html
index dde4a3513e..b18dda9da9 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/admin-local-splash.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/admin-local-splash.component.html
@@ -23,6 +23,8 @@
       url="/eg/staff/admin/local/config/circ_matrix_matchpoint"></eg-link-table-link>
     <eg-link-table-link i18n-label label="Closed Dates Editor" 
       url="/eg/staff/admin/local/actor/closed_dates"></eg-link-table-link>
+    <eg-link-table-link i18n-label label="Course Reserves List"  
+      routerLink="/staff/admin/local/asset/course_list"></eg-link-table-link>
     <eg-link-table-link i18n-label label="Event Definition Group Members"
       routerLink="/staff/admin/local/action_trigger/event_def_group_member"></eg-link-table-link>
     <eg-link-table-link i18n-label label="Event Definition Groups"
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-associate-material.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.html
similarity index 100%
rename from Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-associate-material.component.html
rename to Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.html
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-associate-material.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.ts
similarity index 100%
rename from Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-associate-material.component.ts
rename to Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.ts
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-list.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.html
similarity index 100%
rename from Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-list.component.html
rename to Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.html
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-list.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.ts
similarity index 100%
rename from Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-list.component.ts
rename to Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.ts
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-reserves.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-reserves.module.ts
similarity index 100%
rename from Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-reserves.module.ts
rename to Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-reserves.module.ts
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course.service.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course.service.ts
similarity index 100%
rename from Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course.service.ts
rename to Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course.service.ts
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/routing.module.ts
similarity index 100%
rename from Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/routing.module.ts
rename to Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/routing.module.ts
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts
index c29e7e643d..e0e5414537 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts
@@ -20,6 +20,9 @@ const routes: Routes = [{
     path: 'container/carousel',
     component: AdminCarouselComponent
 }, {
+    path: 'asset/course_list',
+    loadChildren: '@eg/staff/admin/local/course-reserves/course-reserves.module#CourseReservesModule'
+}, {
     path: 'config/standing_penalty',
     component: StandingPenaltyComponent
 }, {
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 df5b9ef490..de399d6517 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
@@ -39,8 +39,6 @@
       routerLink="/staff/admin/server/config/circ_modifier"></eg-link-table-link>
     <eg-link-table-link i18n-label label="Circulation Recurring Fine Rules"  
       routerLink="/staff/admin/server/config/rule_recurring_fine"></eg-link-table-link>
-    <eg-link-table-link i18n-label label="Course Reserves List"  
-      routerLink="/staff/admin/server/asset/course_list"></eg-link-table-link>
     <eg-link-table-link i18n-label label="Custom Org Unit Trees"  
       url="/eg/staff/admin/server/actor/org_unit_custom_tree"></eg-link-table-link>
     <eg-link-table-link i18n-label label="Floating Groups"  
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts
index fe4d35463f..194a979052 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts
@@ -23,9 +23,6 @@ const routes: Routes = [{
     path: 'permission/grp_tree',
     component: PermGroupTreeComponent
 }, {
-    path: 'asset/course_list',
-    loadChildren: '@eg/staff/admin/server/course-reserves/course-reserves.module#CourseReservesModule'
-}, {
     path: 'actor/org_unit',
     loadChildren: () =>
       import('./org-unit.module').then(m => m.OrgUnitModule)
-- 
2.11.0