lp1895606 Remove handling related to lp1939994

- Remove references to course.isArchived. This commit should be ignored when merging with any branch containing lp1939994

Signed-off-by: Kyle Huckins <khuckins@catalyte.io>
 Changes to be committed:
	modified:   Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.html
	modified:   Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.ts

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 6e805e3..3bff3d7 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
@@ -7,12 +7,12 @@
 
 <div class="row">
   <div class="col text-right">
-    <button class="btn btn-danger" *ngIf="currentCourse && (courseIsArchived || currentCourse.is_archived()) == 'f' "
+    <button class="btn btn-danger" *ngIf="currentCourse && (currentCourse.is_archived()) == 'f' "
       (click)="archiveCourse()">
       <span class="align-middle">Archive Course</span>
     </button>
     <button class="btn btn-primary"
-      (click)="unarchiveCourse()" *ngIf="currentCourse && (courseIsArchived || currentCourse.is_archived()) == 't' ">
+      (click)="unarchiveCourse()" *ngIf="currentCourse && (currentCourse.is_archived()) == 't' ">
       <span class="align-middle">Unarchive Course</span>
     </button>
     <a class="btn btn-warning ml-3" routerLink="/staff/admin/local/asset/course_list" i18n>

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 eac4081..41e5566 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
@@ -68,7 +68,6 @@ export class CoursePageComponent implements OnInit {
         this.course.disassociateMaterials([this.currentCourse]).then(res => {
             this.currentCourse.is_archived('f');
             this.pcrud.update(this.currentCourse).subscribe(val => {
-                this.courseIsArchived = 'f';
                 console.debug('archived: ' + val);
                 this.course.removeNonPublicUsers(this.currentCourse.id());
                 this.unarchiveSuccessString.current()