fix fix

Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.html
index b66f0ec..c381d1b 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.html
@@ -53,7 +53,7 @@
 </eg-fm-record-editor>
 
 <ng-template #termMapLink let-row="row">
-  <a routerLink="/staff/admin/local/asset/course_module_term_course_map" [queryParams]="{gridFilters: '{course: ' + row.id() + '}'}" i18n>
+  <a routerLink="/staff/admin/local/asset/course_module_term_course_map" [queryParams]="{gridFilters: acmtcmQueryParams(row)}" i18n>
     Terms taught
   </a>
 </ng-template>

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 bc439a4..118665b 100644 (file)
--- 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
@@ -46,6 +46,8 @@ export class CourseListComponent implements OnInit {
     currentMaterials: any[] = [];
     search_value = '';
 
+    acmtcmQueryParams: (row: any) => string;
+
     constructor(
         private courseSvc: CourseService,
         private locale: LocaleService,
@@ -60,8 +62,13 @@ export class CourseListComponent implements OnInit {
             const idToEdit = course.id();
             this.navigateToCoursePage(idToEdit);
         });
+
+        this.acmtcmQueryParams = (row: any) => {
+            return '{course:' + row.id() + '}';
+        }
     }
 
+
     /**
      * Gets the data, specified by the class, that is available.
      */

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.html
index 967c573..9d57bc0 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.html
@@ -67,6 +67,7 @@
     <a ngbNavLink i18n>Course terms</a>
     <ng-template ngbNavContent>
       <eg-admin-page idlClass="acmtcm" readonlyFields="id"
+        [defaultNewRecord]="defaultNewAcmtcm"
         hideGridFields="id" [dataSource]="termsDataSource">
       </eg-admin-page>
     </ng-template>

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.ts
index d104f71..07d5cbf 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.ts
@@ -1,7 +1,7 @@
 import {Component, ViewChild, OnInit} from '@angular/core';
 import {ActivatedRoute} from '@angular/router';
 import {PcrudService} from '@eg/core/pcrud.service';
-import {IdlObject} from '@eg/core/idl.service';
+import {IdlObject, IdlService} from '@eg/core/idl.service';
 import {GridDataSource} from '@eg/share/grid/grid';
 import {StringComponent} from '@eg/share/string/string.component';
 import {ToastService} from '@eg/share/toast/toast.service';
@@ -34,9 +34,11 @@ export class CoursePageComponent implements OnInit {
 
     // Course Tab
     termsDataSource: GridDataSource = new GridDataSource();
+    defaultNewAcmtcm: IdlObject;
 
     constructor(
         private course: CourseService,
+        private idl: IdlService,
         private pcrud: PcrudService,
         private route: ActivatedRoute,
         private toast: ToastService
@@ -49,6 +51,9 @@ export class CoursePageComponent implements OnInit {
             this.currentCourse = course[0];
         });
 
+        this.defaultNewAcmtcm = this.idl.create('acmtcm');
+        this.defaultNewAcmtcm.course(this.courseId);
+
         this.termsDataSource.getRows = (pager: Pager, sort: any[]) => {
             const orderBy: any = {};
             if (sort.length) {