From 063f403762791a88637fc893e3b65815e6f351df Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Mon, 22 Aug 2016 15:40:42 +0100 Subject: [PATCH] #580 fix activiti task list http calls --- ng2-components/ng2-activiti-tasklist/karma.conf.js | 1 + .../src/components/activiti-filters.component.spec.ts | 2 +- .../src/components/activiti-tasklist.component.spec.ts | 2 +- .../src/services/activiti-tasklist.service.ts | 8 ++++++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ng2-components/ng2-activiti-tasklist/karma.conf.js b/ng2-components/ng2-activiti-tasklist/karma.conf.js index ee5d5a7808..07db0170aa 100644 --- a/ng2-components/ng2-activiti-tasklist/karma.conf.js +++ b/ng2-components/ng2-activiti-tasklist/karma.conf.js @@ -18,6 +18,7 @@ module.exports = function (config) { {pattern: 'node_modules/ng2-alfresco-core/dist/**/*.js', included: false, served: true, watched: false}, {pattern: 'node_modules/ng2-alfresco-datatable/dist/**/*.js', included: false, served: true, watched: false}, {pattern: 'node_modules/ng2-translate/**/*.js', included: false, served: true, watched: false}, + {pattern: 'node_modules/alfresco-js-api/dist/alfresco-js-api.js', included: true, watched: false}, {pattern: 'karma-test-shim.js', included: true, watched: true}, 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 44addfb6c1..bc48397fc9 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, null); + let activitiService = new ActivitiTaskListService(null, null, null); filterList = new ActivitiFilters(null, null, activitiService); }); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts index e827b11951..34d2b3a9aa 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts @@ -64,7 +64,7 @@ describe('ActivitiTaskList', () => { }); beforeEach(() => { - let activitiSerevice = new ActivitiTaskListService(null, null); + let activitiSerevice = new ActivitiTaskListService(null, null, null); taskList = new ActivitiTaskList(null, null, activitiSerevice); }); 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 bfa7d56348..95852eb6b1 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 @@ -19,6 +19,7 @@ import { Injectable } from '@angular/core'; import { AlfrescoSettingsService } from 'ng2-alfresco-core'; import { Http, Headers, RequestOptions, Response } from '@angular/http'; import { Observable } from 'rxjs/Rx'; +import { AlfrescoAuthenticationService } from 'ng2-alfresco-core'; import { FilterModel } from '../models/filter.model'; import { FilterParamsModel } from '../models/filter.model'; import { Comment } from '../models/comment.model'; @@ -29,7 +30,9 @@ import { TaskDetailsModel } from '../models/task-details.model'; @Injectable() export class ActivitiTaskListService { - constructor(private http: Http, public alfrescoSettingsService: AlfrescoSettingsService) { + constructor(private http: Http, + public alfrescoSettingsService: AlfrescoSettingsService, + private authService: AlfrescoAuthenticationService) { } @@ -249,7 +252,8 @@ export class ActivitiTaskListService { private getHeaders(): Headers { return new Headers({ 'Accept': 'application/json', - 'Content-Type': 'application/json' + 'Content-Type': 'application/json', + 'Authorization': this.authService.getTicket('BPM') }); }