Merge branch 'user/khuckins/lp1895706-unarchive-courses' into course-material-test-2

diff --cc Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.html
Simple merge

diff --cc Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.ts
Simple merge

diff --cc Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.html
index e362059,6e805e3..b14c542
--- 1/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.html
--- 2/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,14 +7,14 @@@
  
  <div class="row">
    <div class="col text-right">
-     <button class="btn btn-danger"
-       (click)="archiveCourse()" [disabled]="currentCourse && (courseIsArchived || currentCourse.is_archived()) == 't' ">
-       <i class="material-icons align-middle"
-         *ngIf="currentCourse && (courseIsArchived || currentCourse.is_archived()) == 't'">block</i>
 -    <button class="btn btn-danger" *ngIf="currentCourse && (courseIsArchived || currentCourse.is_archived()) == 'f' "
++    <button class="btn btn-danger" *ngIf="currentCourse && (!courseIsArchived || 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' ">
+       <span class="align-middle">Unarchive Course</span>
+     </button>
      <a class="btn btn-warning ml-3" routerLink="/staff/admin/local/asset/course_list" i18n>
        <i class="material-icons align-middle">keyboard_return</i>
        <span class="align-middle">Return to Course List</span>

diff --cc Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.ts
Simple merge

diff --cc Open-ILS/src/eg2/src/app/staff/share/course.service.ts
Simple merge