From 2428a57f3bccd436fce59a023778d6309ea4ee5b Mon Sep 17 00:00:00 2001 From: Kyle Huckins Date: Mon, 25 Nov 2019 20:46:53 +0000 Subject: [PATCH] lp1849212 - Move Course Service to staff/share directory Signed-off-by: Kyle Huckins Changes to be committed: modified: Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.ts modified: Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.ts modified: Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-reserves.module.ts renamed: Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course.service.ts -> Open-ILS/src/eg2/src/app/staff/share/course.service.ts Signed-off-by: Michele Morgan Signed-off-by: Galen Charlton --- .../admin/local/course-reserves/course-associate-material.component.ts | 2 +- .../src/app/staff/admin/local/course-reserves/course-list.component.ts | 2 +- .../app/staff/admin/local/course-reserves/course-reserves.module.ts | 3 ++- .../app/staff/{admin/local/course-reserves => share}/course.service.ts | 0 4 files changed, 4 insertions(+), 3 deletions(-) rename Open-ILS/src/eg2/src/app/staff/{admin/local/course-reserves => share}/course.service.ts (100%) diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.ts index cb8eeeb317..5fcad15b96 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.ts @@ -13,7 +13,7 @@ import {GridComponent} from '@eg/share/grid/grid.component'; import {IdlObject, IdlService} from '@eg/core/idl.service'; import {StringComponent} from '@eg/share/string/string.component'; import {ToastService} from '@eg/share/toast/toast.service'; -import {CourseService} from './course.service'; +import {CourseService} from '@eg/staff/share/course.service'; @Component({ selector: 'eg-course-associate-material-dialog', diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.ts index ab9cd3b36e..53875f39b0 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.ts @@ -2,7 +2,7 @@ import {Component, Input, ViewChild, OnInit} from '@angular/core'; import {IdlObject} from '@eg/core/idl.service'; import {PcrudService} from '@eg/core/pcrud.service'; import {AuthService} from '@eg/core/auth.service'; -import {CourseService} from './course.service'; +import {CourseService} from '@eg/staff/share/course.service'; import {NetService} from '@eg/core/net.service'; import {OrgService} from '@eg/core/org.service'; import {GridComponent} from '@eg/share/grid/grid.component'; diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-reserves.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-reserves.module.ts index 6f6eed594a..64bd5dc183 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-reserves.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-reserves.module.ts @@ -5,7 +5,8 @@ import {CourseListComponent} from './course-list.component'; import {CourseAssociateMaterialComponent} from './course-associate-material.component'; import {CourseReservesRoutingModule} from './routing.module'; import {ItemLocationSelectModule} from '@eg/share/item-location-select/item-location-select.module'; -import {CourseService} from './course.service' +import {CourseService} from '@eg/staff/share/course.service'; + @NgModule({ declarations: [ CourseListComponent, diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course.service.ts b/Open-ILS/src/eg2/src/app/staff/share/course.service.ts similarity index 100% rename from Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course.service.ts rename to Open-ILS/src/eg2/src/app/staff/share/course.service.ts -- 2.11.0