inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-06-30 18:15:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACA-4361] Fix data column conflict (#6986)

Browse Source 
* [ACA-4361] Fix data column conflict

* * revert html
This commit is contained in:
Dharan 2021-05-07 23:09:39 +05:30 committed by GitHub
parent 0b272b0de9
commit 5780b46acc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/core/data-column/data-column-header.component.ts
View File

@ -27,13 +27,13 @@ import { DataColumnComponent } from './data-column.component';
export class DateColumnHeaderComponent { export class DateColumnHeaderComponent {
@ContentChild(TemplateRef) @ContentChild(TemplateRef)
public template: TemplateRef<any>; public header: TemplateRef<any>;
constructor(private columnComponent: DataColumnComponent) {} constructor(private columnComponent: DataColumnComponent) {}
ngAfterContentInit() { ngAfterContentInit() {
if (this.columnComponent) { if (this.columnComponent) {
this.columnComponent.header = this.template; this.columnComponent.header = this.header;
} }
} }
} }

2
lib/core/datatable/data/object-datacolumn.model.ts
View File

@ -46,6 +46,6 @@ export class ObjectDataColumn implements DataColumn {
this.copyContent = input.copyContent; this.copyContent = input.copyContent;
this.focus = input.focus; this.focus = input.focus;
this.sortingKey = input.sortingKey; this.sortingKey = input.sortingKey;
this.header = input.template; this.header = input.header;
} }
} }