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>

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 dde4a35..b18dda9 100644 (file)
--- 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 c29e7e6..e0e5414 100644 (file)
--- 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 df5b9ef..de399d6 100644 (file)
--- 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 fe4d354..194a979 100644 (file)
--- 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)