From 74c205ec115abf6ee338e3d2dc51a2aaad35ac8c Mon Sep 17 00:00:00 2001
From: mauriziovitale84 <maurizio.vitale@alfresco.com>
Date: Fri, 29 Jul 2016 12:03:37 +0100
Subject: [PATCH] Fixed problem after rebase

---
 .../src/components/activiti-filters.component.spec.ts     | 2 +-
 .../src/services/activiti-tasklist.service.ts             | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts
index 0de606f054..41528c026d 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.spec.ts
@@ -48,7 +48,7 @@ describe('ActivitiFilters', () => {
     });
 
     beforeEach(() => {
-        let activitiService = new ActivitiTaskListService(null);
+        let activitiService = new ActivitiTaskListService(null, null);
         filterList = new ActivitiFilters(null, null, activitiService);
     });
 
diff --git a/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.ts b/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.ts
index 8d646dddae..9ac14799b3 100644
--- a/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.ts
@@ -195,7 +195,7 @@ export class ActivitiTaskListService {
     }
 
     private callApiTaskComments(id: string) {
-        let url = `${this.basePath}/api/enterprise/tasks/${id}/comments`;
+        let url = this.alfrescoSettingsService.getBPMApiBaseUrl() + `/api/enterprise/tasks/${id}/comments`;
         let headers = new Headers({
             'Content-Type': 'application/json',
             'Cache-Control': 'no-cache'
@@ -207,7 +207,7 @@ export class ActivitiTaskListService {
     }
 
     private callApiAddTaskComment(id: string, message: string) {
-        let url = `${this.basePath}/api/enterprise/tasks/${id}/comments`;
+        let url = this.alfrescoSettingsService.getBPMApiBaseUrl() + `/api/enterprise/tasks/${id}/comments`;
         let headers = new Headers({
             'Content-Type': 'application/json',
             'Cache-Control': 'no-cache'
@@ -220,7 +220,7 @@ export class ActivitiTaskListService {
     }
 
     private callApiAddTask(task: TaskDetailsModel) {
-        let url = `${this.basePath}/api/enterprise/tasks/${task.parentTaskId}/checklist`;
+        let url = this.alfrescoSettingsService.getBPMApiBaseUrl() + `/api/enterprise/tasks/${task.parentTaskId}/checklist`;
         let headers = new Headers({
             'Content-Type': 'application/json',
             'Cache-Control': 'no-cache'
@@ -233,7 +233,7 @@ export class ActivitiTaskListService {
     }
 
     private callApiTaskChecklist(id: string) {
-        let url = `${this.basePath}/api/enterprise/tasks/${id}/checklist`;
+        let url = this.alfrescoSettingsService.getBPMApiBaseUrl() + `/api/enterprise/tasks/${id}/checklist`;
         let headers = new Headers({
             'Content-Type': 'application/json',
             'Cache-Control': 'no-cache'