From 9c7062ecb1f2dfd95c30477650c01d3a00a266b4 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 20 Nov 2019 11:57:26 -0500 Subject: [PATCH] LP1835982 Remove more deprecated cellPrintValue refs cellPrintValue inputs were replaced with grid-wide cellTextGenerator handlers. This patch removes a few remaining references to cellPrintValue inputs. Having them linger was breaking --prod builds, since they referred to nonexistent methods. Signed-off-by: Bill Erickson Signed-off-by: Galen Charlton Signed-off-by: Jane Sandberg --- .../src/eg2/src/app/share/grid/grid-column.component.ts | 2 -- Open-ILS/src/eg2/src/app/share/grid/grid.ts | 4 ---- .../eg2/src/app/staff/cat/vandelay/queue.component.html | 7 +++---- .../eg2/src/app/staff/catalog/record/copies.component.html | 3 +-- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-column.component.ts b/Open-ILS/src/eg2/src/app/share/grid/grid-column.component.ts index bb30842445..f2171ddd9b 100644 --- a/Open-ILS/src/eg2/src/app/share/grid/grid-column.component.ts +++ b/Open-ILS/src/eg2/src/app/share/grid/grid-column.component.ts @@ -39,7 +39,6 @@ export class GridColumnComponent implements OnInit { // Used in conjunction with cellTemplate @Input() cellContext: any; @Input() cellTemplate: TemplateRef; - @Input() cellPrintValue: (row: any, cell: GridColumn) => string; @Input() disableTooltip: boolean; @@ -61,7 +60,6 @@ export class GridColumnComponent implements OnInit { col.hidden = this.hidden === true; col.isIndex = this.index === true; col.cellTemplate = this.cellTemplate; - col.cellPrintValue = this.cellPrintValue; col.cellContext = this.cellContext; col.disableTooltip = this.disableTooltip; col.isSortable = this.sortable; diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid.ts b/Open-ILS/src/eg2/src/app/share/grid/grid.ts index 20bde50f5e..93094c3398 100644 --- a/Open-ILS/src/eg2/src/app/share/grid/grid.ts +++ b/Open-ILS/src/eg2/src/app/share/grid/grid.ts @@ -31,10 +31,6 @@ export class GridColumn { timezoneContextOrg: number; cellTemplate: TemplateRef; - // Provide a way for cells that are generated via cellTemplate's - // to provide an alternate text value suitable for printing. - cellPrintValue: (row: any, cell: GridColumn) => string; - cellContext: any; isIndex: boolean; isDragTarget: boolean; diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue.component.html b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue.component.html index 16c97da6a2..b3b39a8a16 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue.component.html +++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue.component.html @@ -144,13 +144,12 @@ because there are a lot of them. + [cellTemplate]="matchesTmpl"> + label="Import Errors" [cellTemplate]="errorsTmpl"> + [cellTemplate]="importedAsTmpl"> diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.html index 2d6707b716..8c511c3e6d 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.html +++ b/Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.html @@ -60,8 +60,7 @@ path="active_date" datatype="timestamp"> + [cellTemplate]="holdableTemplate" [cellContext]="copyContext"> -- 2.43.2