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

Replace loadingFlag with isLoading (#2074)

Browse Source
This commit is contained in:
Maurizio Vitale
2017-07-11 22:02:41 +01:00
committed by Eugenio Romano
parent 61a81b3948
commit 689eb42f72
10 changed files with 28 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.html
View File

@@ -3,7 +3,7 @@
<div>
<adf-datatable
[data]="data"
[loading]="isLoading()"
[loading]="isLoading"
(rowClick)="onRowClick($event)">
<loading-content-template>
<ng-template>

14
ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts
View File

@@ -82,7 +82,7 @@ export class ActivitiTaskList implements OnChanges, AfterContentInit {
currentInstanceId: string;
loadingFlag: boolean = true;
isLoading: boolean = true;
/**
* Toggles custom data source mode.
@@ -182,7 +182,7 @@ export class ActivitiTaskList implements OnChanges, AfterContentInit {
}
private load(requestNode: TaskQueryRequestRepresentationModel) {
this.loadingFlag = true;
this.isLoading = true;
this.taskListService.getTotalTasks(requestNode).subscribe(
(res) => {
requestNode.size = res.total;
@@ -192,14 +192,14 @@ export class ActivitiTaskList implements OnChanges, AfterContentInit {
this.renderInstances(instancesRow);
this.selectTask(requestNode.landingTaskId);
this.onSuccess.emit(response);
this.loadingFlag = false;
this.isLoading = false;
}, (error) => {
this.onError.emit(error);
this.loadingFlag = false;
this.isLoading = false;
});
}, (err) => {
this.onError.emit(err);
this.loadingFlag = false;
this.isLoading = false;
});
}
@@ -306,8 +306,4 @@ export class ActivitiTaskList implements OnChanges, AfterContentInit {
};
return new TaskQueryRequestRepresentationModel(requestNode);
}
isLoading() {
return this.loadingFlag;
}
}

2
ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.html
View File

@@ -1,7 +1,7 @@
<adf-datatable
[rows]="attachments"
[actions]="true"
[loading]="isLoading()"
[loading]="isLoading"
(rowDblClick)="openContent($event)"
(showRowActionsMenu)="onShowRowActionsMenu($event)"
(executeRowAction)="onExecuteRowAction($event)">

12
ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.ts
View File

@@ -39,7 +39,7 @@ export class TaskAttachmentListComponent implements OnChanges {
error: EventEmitter<any> = new EventEmitter<any>();
attachments: any[] = [];
loadingFlag: boolean = true;
isLoading: boolean = true;
constructor(private translateService: AlfrescoTranslationService,
private activitiContentService: ActivitiContentService,
@@ -77,7 +77,7 @@ export class TaskAttachmentListComponent implements OnChanges {
private loadAttachmentsByTaskId(taskId: string) {
if (taskId) {
this.loadingFlag = true;
this.isLoading = true;
this.reset();
this.activitiContentService.getTaskRelatedContent(taskId).subscribe(
(res: any) => {
@@ -93,11 +93,11 @@ export class TaskAttachmentListComponent implements OnChanges {
});
this.attachments = attachList;
this.success.emit(this.attachments);
this.loadingFlag = false;
this.isLoading = false;
},
(err) => {
this.error.emit(err);
this.loadingFlag = false;
this.isLoading = false;
});
}
}
@@ -180,8 +180,4 @@ export class TaskAttachmentListComponent implements OnChanges {
}
);
}
isLoading() {
return this.loadingFlag;
}
}