inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-3918] Fix translation issue (#4169)

Browse Source
This commit is contained in:
Eugenio Romano
2019-01-20 23:40:07 +00:00
committed by GitHub
parent 9a70852985
commit 348bee9c6f
22 changed files with 253 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/core/datatable/data/data-table.schema.ts
View File

@@ -54,8 +54,7 @@ export abstract class DataTableSchema {
}
public mergeJsonAndHtmlSchema(): any {
let customSchemaColumns = [];
customSchemaColumns = this.getSchemaFromConfig(this.presetColumn).concat(this.getSchemaFromHtml(this.columnList));
let customSchemaColumns = this.getSchemaFromConfig(this.presetColumn).concat(this.getSchemaFromHtml(this.columnList));
if (customSchemaColumns.length === 0) {
customSchemaColumns = this.getDefaultLayoutPreset();
}