diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.html
index 8537495d39..6544b0f605 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.html
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.html
@@ -5,10 +5,10 @@
-
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.ts
index 1f71e5580f..82284c23b7 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.ts
@@ -61,7 +61,7 @@ export class ActivitiProcessInstanceVariables implements OnInit, OnChanges {
variableValue: string;
variableScope: string;
- loadingFlag: boolean = true;
+ isLoading: boolean = true;
/**
* Constructor
@@ -146,16 +146,16 @@ export class ActivitiProcessInstanceVariables implements OnInit, OnChanges {
private getProcessInstanceVariables(processInstanceId: string) {
if (processInstanceId) {
- this.loadingFlag = true;
+ this.isLoading = true;
this.activitiProcess.getProcessInstanceVariables(processInstanceId).subscribe(
(res: ProcessInstanceVariable[]) => {
let instancesRow = this.createDataRow(res);
this.renderInstances(instancesRow);
- this.loadingFlag = false;
+ this.isLoading = false;
},
(err) => {
this.error.emit(err);
- this.loadingFlag = false;
+ this.isLoading = false;
}
);
} else {
@@ -275,8 +275,4 @@ export class ActivitiProcessInstanceVariables implements OnInit, OnChanges {
{ id: 'edit', title: 'Edit' }
];
}
-
- isLoading() {
- return this.loadingFlag;
- }
}
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.html
index baef8956f7..050d25e38c 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.html
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.html
@@ -3,7 +3,7 @@
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts
index 83a605fd8d..c6f0bfc40c 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts
@@ -62,7 +62,7 @@ export class ActivitiProcessInstanceListComponent implements OnChanges, AfterCon
onError: EventEmitter = new EventEmitter();
currentInstanceId: string;
- loadingFlag: boolean = true;
+ isLoading: boolean = true;
private defaultSchema: DataColumn[] = [
{ type: 'text', key: 'name', title: 'Name', cssClass: 'full-width name-column', sortable: true },
@@ -141,7 +141,7 @@ export class ActivitiProcessInstanceListComponent implements OnChanges, AfterCon
}
private load(requestNode: ProcessFilterRequestRepresentation) {
- this.loadingFlag = true;
+ this.isLoading = true;
this.processService.getProcessInstances(requestNode)
.subscribe(
(response) => {
@@ -149,11 +149,11 @@ export class ActivitiProcessInstanceListComponent implements OnChanges, AfterCon
this.renderInstances(instancesRow);
this.selectFirst();
this.onSuccess.emit(response);
- this.loadingFlag = false;
+ this.isLoading = false;
},
error => {
this.onError.emit(error);
- this.loadingFlag = false;
+ this.isLoading = false;
});
}
@@ -279,8 +279,4 @@ export class ActivitiProcessInstanceListComponent implements OnChanges, AfterCon
};
return new ProcessFilterRequestRepresentation(requestNode);
}
-
- isLoading() {
- return this.loadingFlag;
- }
}
diff --git a/ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.html b/ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.html
index 2c8e905216..510301cc16 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.html
+++ b/ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.html
@@ -1,7 +1,7 @@
diff --git a/ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.ts b/ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.ts
index e2b3104adb..053c62065a 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/adf-process-attachment-list.component.ts
@@ -39,7 +39,7 @@ export class ActivitiProcessAttachmentListComponent implements OnChanges {
error: EventEmitter = new EventEmitter();
attachments: any[] = [];
- loadingFlag: boolean = true;
+ isLoading: boolean = true;
constructor(private translateService: AlfrescoTranslationService,
private activitiContentService: ActivitiContentService,
@@ -78,7 +78,7 @@ export class ActivitiProcessAttachmentListComponent implements OnChanges {
private loadAttachmentsByProcessInstanceId(processInstanceId: string) {
if (processInstanceId) {
this.reset();
- this.loadingFlag = true;
+ this.isLoading = true;
this.activitiContentService.getProcessRelatedContent(processInstanceId).subscribe(
(res: any) => {
res.data.forEach(content => {
@@ -91,11 +91,11 @@ export class ActivitiProcessAttachmentListComponent implements OnChanges {
});
});
this.success.emit(this.attachments);
- this.loadingFlag = false;
+ this.isLoading = false;
},
(err) => {
this.error.emit(err);
- this.loadingFlag = false;
+ this.isLoading = false;
});
}
}
@@ -178,8 +178,4 @@ export class ActivitiProcessAttachmentListComponent implements OnChanges {
}
);
}
-
- isLoading() {
- return this.loadingFlag;
- }
}
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.html b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.html
index e524993576..f010b72aa7 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.html
+++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.html
@@ -3,7 +3,7 @@
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts
index cc68b39373..8f170f8580 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts
@@ -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;
- }
}
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.html b/ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.html
index 7ce9ce48ae..d0c9e62d17 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.html
+++ b/ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.html
@@ -1,7 +1,7 @@
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.ts
index 78930a9033..dbaaf6d849 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/adf-task-attachment-list.component.ts
@@ -39,7 +39,7 @@ export class TaskAttachmentListComponent implements OnChanges {
error: EventEmitter = new EventEmitter();
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;
- }
}