From: Kyle Huckins <khuckins@catalyte.io>
Date: Tue, 22 Mar 2022 21:04:30 +0000 (+0000)
Subject: Merge branch 'user/khuckins/lp1895706-unarchive-courses' into course-material-test-2
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=1ec3972bd2fa4ef04d2eba0edfc7d88a01b7d019;p=working%2FEvergreen.git

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

1ec3972bd2fa4ef04d2eba0edfc7d88a01b7d019
diff --cc Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.html
index e362059757,6e805e338a..b14c542030
--- 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,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>