From: Zavier Banks <zbanks@catalyte.io>
Date: Fri, 8 Nov 2019 21:26:40 +0000 (+0000)
Subject: Merge branch 'user/khuckins/lp1849212-course-materials-module-omnibus' of git://git... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=a2e88ffad69615075d6633cd4dc235067d5f0969;p=working%2FEvergreen.git

Merge branch 'user/khuckins/lp1849212-course-materials-module-omnibus' of git://git.evergreen-ils.org/working/Evergreen into user/zbanks/lp1849212-angular-search-course-reserves-facet

Signed-off-by: Zavier Banks <zbanks@catalyte.io>
---

a2e88ffad69615075d6633cd4dc235067d5f0969
diff --cc Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-list.component.ts
index 9e4bb40878,05fe7c9889..ac99f25b9d
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-list.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-list.component.ts
@@@ -22,8 -22,6 +22,11 @@@ export class CourseListComponent implem
      @ViewChild('updateFailedString', { static: false }) updateFailedString: StringComponent;
      @ViewChild('deleteFailedString', { static: true }) deleteFailedString: StringComponent;
      @ViewChild('deleteSuccessString', { static: true }) deleteSuccessString: StringComponent;
++<<<<<<< HEAD
 +    @ViewChild('flairTooltip', { static: true }) private flairTooltip: StringComponent;
 +    rowFlairCallback: (row: any) => GridRowFlairEntry;
++=======
++>>>>>>> 3caf654095ad80baf21646630e2a9324bf0ad314
      @Input() sort_field: string;
      @Input() idl_class = "acmc";
      @Input() dialog_size: 'sm' | 'lg' = 'lg';
@@@ -38,7 -36,6 +41,10 @@@
  
      ngOnInit() {
          this.getSource();
++<<<<<<< HEAD
 +        this.rowFlair();
++=======
++>>>>>>> 3caf654095ad80baf21646630e2a9324bf0ad314
      }
  
      /**
@@@ -63,24 -60,6 +69,27 @@@
          };
      }
  
++<<<<<<< HEAD
 +    rowFlair() {
 +        this.rowFlairCallback = (row: any): GridRowFlairEntry => {
 +            const flair = {icon: null, title: null};
 +            if (row.id() < 100) {
 +                flair.icon = 'not_interested';
 +                flair.title = this.flairTooltip.text;
 +            }
 +            return flair;
 +        };
 +    }
 +
 +    gridCellClassCallback = (row: any, col: GridColumn): string => {
 +        if (col.name === 'id' && row.a[0] < 100) {
 +            return 'text-danger';
 +        }
 +        return '';
 +    }
 +
++=======
++>>>>>>> 3caf654095ad80baf21646630e2a9324bf0ad314
      showEditDialog(standingPenalty: IdlObject): Promise<any> {
          this.editDialog.mode = 'update';
          this.editDialog.recordId = standingPenalty['id']();