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

[ADF-1871] Tasklist IE 11 crash

Browse Source
This commit is contained in:
Eugenio Romano 2017-11-23 01:23:04 +00:00
parent d7b790f2bb
commit d2e1dc5aed
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/core/card-view/card-view.component.html
View File

@ -1,7 +1,8 @@
<div class="adf-property-list"> <div class="adf-property-list">
<ng-container *ngFor="let property of properties"> <div *ngFor="let property of properties">
<div [attr.data-automation-id]="'header-'+property.key" class="adf-property"> <div [attr.data-automation-id]="'header-'+property.key" class="adf-property">
<adf-card-view-item-dispatcher [property]="property" [editable]="editable"></adf-card-view-item-dispatcher> <adf-card-view-item-dispatcher [property]="property" [editable]="editable"></adf-card-view-item-dispatcher>
</div> </div>
</ng-container>
</div> </div>
</div>

17
lib/process-services/task-list/components/task-list.component.ts
View File

@ -231,11 +231,23 @@ export class TaskListComponent implements OnChanges, OnInit, AfterContentInit {
/** /**
* Select the task given in input if present * Select the task given in input if present
*/ */
selectTask(taskIdToSelect: string): void { selectTask(taskIdSelected: string): void {
if (!this.isListEmpty()) { if (!this.isListEmpty()) {
let rows = this.data.getRows(); let rows = this.data.getRows();
if (rows.length > 0) { if (rows.length > 0) {
let dataRow = rows.find(row => row.getValue('id') === taskIdToSelect) || rows[0]; let dataRow;
if (taskIdSelected) {
dataRow = rows.find((currentRow: any) => {
return currentRow.getValue('id') === taskIdSelected;
});
if (!dataRow) {
dataRow = rows[0];
}
} else {
dataRow = rows[0];
}
this.data.selectedRow = dataRow; this.data.selectedRow = dataRow;
dataRow.isSelected = true; dataRow.isSelected = true;
this.currentInstanceId = dataRow.getValue('id'); this.currentInstanceId = dataRow.getValue('id');
@ -244,6 +256,7 @@ export class TaskListComponent implements OnChanges, OnInit, AfterContentInit {
if (this.data) { if (this.data) {
this.data.selectedRow = null; this.data.selectedRow = null;
} }
this.currentInstanceId = null; this.currentInstanceId = null;
} }
} }

3
lib/process-services/task-list/services/tasklist.service.ts
View File

@ -24,6 +24,9 @@ import { Form } from '../models/form.model';
import { TaskDetailsModel } from '../models/task-details.model'; import { TaskDetailsModel } from '../models/task-details.model';
import { TaskListModel } from '../models/task-list.model'; import { TaskListModel } from '../models/task-list.model';
import 'rxjs/add/observable/throw'; import 'rxjs/add/observable/throw';
import 'rxjs/add/observable/forkJoin';
import 'rxjs/add/observable/fromPromise';
import 'rxjs/operator/switchMap';
@Injectable() @Injectable()
export class TaskListService { export class TaskListService {