fixes for AoT (#2995)

* fixes for missing values in templates

* fix location cell implementation for object picker
This commit is contained in:
Denys Vuika
2018-02-24 10:28:45 +00:00
committed by Eugenio Romano
parent e24fe25c20
commit 40f51a17df
4 changed files with 17 additions and 11 deletions

View File

@@ -79,8 +79,8 @@
<data-columns> <data-columns>
<data-column key="$thumbnail" type="image"></data-column> <data-column key="$thumbnail" type="image"></data-column>
<data-column key="name" type="text" class="full-width ellipsis-cell"> <data-column key="name" type="text" class="full-width ellipsis-cell">
<ng-template let-context="$implicit"> <ng-template let-context>
<adf-name-location-cell [data]="context.data" [column]="context.col" [row]="context.row"></adf-name-location-cell> <adf-name-location-cell [row]="context.row"></adf-name-location-cell>
</ng-template> </ng-template>
</data-column> </data-column>
<data-column key="modifiedAt" type="date" format="timeAgo" class="adf-content-selector-modified-cell"></data-column> <data-column key="modifiedAt" type="date" format="timeAgo" class="adf-content-selector-modified-cell"></data-column>

View File

@@ -15,29 +15,36 @@
* limitations under the License. * limitations under the License.
*/ */
import { ChangeDetectionStrategy, Component, OnInit, ViewEncapsulation } from '@angular/core'; import { Input, ChangeDetectionStrategy, Component, OnInit, ViewEncapsulation } from '@angular/core';
import { DataTableCellComponent } from '@alfresco/adf-core'; import { DataRow } from '@alfresco/adf-core';
@Component({ @Component({
selector: 'adf-name-location-cell', selector: 'adf-name-location-cell',
template: ` template: `
<div class="adf-name-location-cell-name">{{ name }}</div> <div class="adf-name-location-cell-name">{{ name }}</div>
<div class="adf-name-location-cell-location" [title]="path?.name">{{ path?.name }}</div> <div class="adf-name-location-cell-location" [title]="path">{{ path }}</div>
`, `,
styleUrls: ['./name-location-cell.component.scss'], styleUrls: ['./name-location-cell.component.scss'],
encapsulation: ViewEncapsulation.None, encapsulation: ViewEncapsulation.None,
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush,
host: { class: 'adf-name-location-cell' } host: { class: 'adf-name-location-cell' }
}) })
export class NameLocationCellComponent extends DataTableCellComponent implements OnInit { export class NameLocationCellComponent implements OnInit {
path: string = '';
name: string = ''; name: string = '';
path: string = '';
@Input()
row: DataRow;
ngOnInit() { ngOnInit() {
if (this.row) { if (this.row) {
this.path = this.row.getValue('path');
this.name = this.row.getValue('name'); this.name = this.row.getValue('name');
const fullPath = this.row.getValue('path');
if (fullPath) {
this.path = fullPath.name || '';
}
} }
} }
} }

View File

@@ -16,6 +16,6 @@
</mat-form-field> </mat-form-field>
<error-widget [error]="field.validationSummary"></error-widget> <error-widget [error]="field.validationSummary"></error-widget>
<error-widget *ngIf="isInvalidFieldRequired()" required="{{ 'FORM.FIELD.REQUIRED' | translate }}"></error-widget> <error-widget *ngIf="isInvalidFieldRequired()" required="{{ 'FORM.FIELD.REQUIRED' | translate }}"></error-widget>
<mat-datepicker #datePicker [touchUi]="true" [startAt]="startAt" ></mat-datepicker> <mat-datepicker #datePicker [touchUi]="true" [startAt]="displayDate" ></mat-datepicker>
</div> </div>

View File

@@ -1,5 +1,4 @@
<div class="adf-people-widget {{field.className}}" <div class="adf-people-widget {{field.className}}"
[class.is-dirty]="value"
[class.adf-invalid]="!field.isValid" [class.adf-invalid]="!field.isValid"
[class.adf-readonly]="field.readOnly" [class.adf-readonly]="field.readOnly"
id="people-widget-content"> id="people-widget-content">