diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
index 54b52684f8..08b70a0b26 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
+++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
@@ -141,12 +141,12 @@
(row-dblclick)="onProcessRowDblClick($event)"
(onSuccess)="onSuccessProcessList($event)">
-
+
diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts
index 7a11ef8608..0ba7827933 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts
+++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.ts
@@ -139,15 +139,6 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
this.dataTasks = new ObjectDataTableAdapter();
this.dataTasks.setSorting(new DataSorting('created', 'desc'));
- this.dataProcesses = new ObjectDataTableAdapter(
- [],
- [
- { type: 'text', key: 'name', title: 'Name', cssClass: 'full-width name-column', sortable: true },
- { type: 'text', key: 'started', title: 'Started', cssClass: 'hidden', sortable: true }
- ]
- );
- this.dataProcesses.setSorting(new DataSorting('started', 'desc'));
-
// Uncomment this line to replace all 'text' field editors with custom component
// formRenderingService.setComponentTypeResolver('text', () => CustomEditorComponent, true);
diff --git a/docs/process-list.component.md b/docs/process-list.component.md
index 058e2b1460..0c19f462c0 100644
--- a/docs/process-list.component.md
+++ b/docs/process-list.component.md
@@ -20,8 +20,8 @@ This component renders a list containing all the process instances matched by th
**app.component.html**
```html
-
```
diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.html b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.html
index bec05cb242..93130712b0 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.html
+++ b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.html
@@ -2,10 +2,10 @@
(executeRowAction)="onExecuteRowAction($event)">
-
+
-
{{'PROCESS-ATTACHMENT.EMPTY.DRAG-AND-DROP.TITLE' | translate}}
-
{{'PROCESS-ATTACHMENT.EMPTY.DRAG-AND-DROP.SUBTITLE' | translate}}
+
{{'ADF_PROCESS_LIST.PROCESS-ATTACHMENT.EMPTY.DRAG-AND-DROP.TITLE' | translate}}
+
{{'ADF_PROCESS_LIST.PROCESS-ATTACHMENT.EMPTY.DRAG-AND-DROP.SUBTITLE' | translate}}
![]()
diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.spec.ts
index d1f6834f7e..f5bd34e2da 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.spec.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.spec.ts
@@ -207,7 +207,7 @@ describe('ProcessAttachmentListComponent', () => {
component.ngOnChanges({'processInstanceId': change});
fixture.whenStable().then(() => {
fixture.detectChanges();
- expect(fixture.nativeElement.querySelector('div[adf-empty-list-header]').innerText.trim()).toEqual('PROCESS-ATTACHMENT.EMPTY.HEADER');
+ expect(fixture.nativeElement.querySelector('div[adf-empty-list-header]').innerText.trim()).toEqual('ADF_PROCESS_LIST.PROCESS-ATTACHMENT.EMPTY.HEADER');
});
}));
@@ -222,7 +222,8 @@ describe('ProcessAttachmentListComponent', () => {
component.ngOnChanges({'processInstanceId': change});
fixture.whenStable().then(() => {
fixture.detectChanges();
- expect(fixture.nativeElement.querySelector('adf-empty-list .adf-empty-list-drag_drop').innerText.trim()).toEqual('PROCESS-ATTACHMENT.EMPTY.DRAG-AND-DROP.TITLE');
+ expect(fixture.nativeElement.querySelector('adf-empty-list .adf-empty-list-drag_drop').innerText.trim())
+ .toEqual('ADF_PROCESS_LIST.PROCESS-ATTACHMENT.EMPTY.DRAG-AND-DROP.TITLE');
});
}));
@@ -240,7 +241,7 @@ describe('ProcessAttachmentListComponent', () => {
fixture.whenStable().then(() => {
fixture.detectChanges();
expect(fixture.nativeElement.querySelector('adf-empty-list .adf-empty-list-drag_drop')).toBeNull();
- expect(fixture.nativeElement.querySelector('div[adf-empty-list-header]').innerText.trim()).toEqual('PROCESS-ATTACHMENT.EMPTY.HEADER');
+ expect(fixture.nativeElement.querySelector('div[adf-empty-list-header]').innerText.trim()).toEqual('ADF_PROCESS_LIST.PROCESS-ATTACHMENT.EMPTY.HEADER');
});
}));
@@ -257,7 +258,8 @@ describe('ProcessAttachmentListComponent', () => {
fixture.whenStable().then(() => {
fixture.detectChanges();
- expect(fixture.nativeElement.querySelector('div[adf-empty-list-header]').innerText.trim()).toEqual('PROCESS-ATTACHMENT.EMPTY.HEADER');
+ expect(fixture.nativeElement.querySelector('div[adf-empty-list-header]').innerText.trim())
+ .toEqual('ADF_PROCESS_LIST.PROCESS-ATTACHMENT.EMPTY.HEADER');
});
}));
diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-comments.component.html b/ng2-components/ng2-activiti-processlist/src/components/process-comments.component.html
index db7e4d5b01..e5956f5c7e 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/process-comments.component.html
+++ b/ng2-components/ng2-activiti-processlist/src/components/process-comments.component.html
@@ -1,10 +1,10 @@
{{task.name || 'Nameless task'}}
- {{ 'DETAILS.LABELS.TASK_SUBTITLE' | translate:{user: getUserFullName(task.assignee), created: getFormatDate(task.created, 'mediumDate') } }} + {{ 'ADF_PROCESS_LIST.DETAILS.LABELS.TASK_SUBTITLE' | translate:{user: getUserFullName(task.assignee), created: getFormatDate(task.created, 'mediumDate') } }} @@ -26,20 +26,20 @@{{ 'DETAILS.LABELS.START_FORM'|translate }}
+{{ 'ADF_PROCESS_LIST.DETAILS.LABELS.START_FORM'|translate }}
- {{ 'DETAILS.LABELS.TASK_SUBTITLE' | translate:{user:getUserFullName(processInstanceDetails.startedBy), created: getFormatDate(processInstanceDetails.started, 'mediumDate') } }} + {{ 'ADF_PROCESS_LIST.DETAILS.LABELS.TASK_SUBTITLE' | translate:{user:getUserFullName(processInstanceDetails.startedBy), created: getFormatDate(processInstanceDetails.started, 'mediumDate') } }}{{task.name || 'Nameless task'}}
- {{ 'DETAILS.LABELS.TASK_SUBTITLE' | translate:{user:getUserFullName(task.assignee), created: getFormatDate(task.created, 'mediumDate') } }} + {{ 'ADF_PROCESS_LIST.DETAILS.LABELS.TASK_SUBTITLE' | translate:{user:getUserFullName(task.assignee), created: getFormatDate(task.created, 'mediumDate') } }}{{ 'DETAILS.LABELS.START_FORM'|translate }}
+{{ 'ADF_PROCESS_LIST.DETAILS.LABELS.START_FORM'|translate }}