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

Post-merge fixes

Browse Source
This commit is contained in:
Denys Vuika
2016-09-26 10:02:19 +01:00
parent db063cefba
commit 8cb52cd48a
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts
View File

@@ -18,13 +18,9 @@
import { Component, Input, OnInit, ViewChild, Output, EventEmitter, TemplateRef, OnChanges, SimpleChanges } from '@angular/core'; import { Component, Input, OnInit, ViewChild, Output, EventEmitter, TemplateRef, OnChanges, SimpleChanges } from '@angular/core';
import { AlfrescoTranslationService, AlfrescoAuthenticationService } from 'ng2-alfresco-core'; import { AlfrescoTranslationService, AlfrescoAuthenticationService } from 'ng2-alfresco-core';
import { ActivitiTaskListService } from './../services/activiti-tasklist.service'; import { ActivitiTaskListService } from './../services/activiti-tasklist.service';
import { ActivitiTaskHeader } from './activiti-task-header.component';
import { ActivitiComments } from './activiti-comments.component';
import { ActivitiChecklist } from './activiti-checklist.component';
import { ActivitiPeople } from './activiti-people.component';
import { TaskDetailsModel } from '../models/task-details.model'; import { TaskDetailsModel } from '../models/task-details.model';
import { User } from '../models/user.model'; import { User } from '../models/user.model';
import { ActivitiForm, FormModel, FormService } from 'ng2-activiti-form'; import { FormModel, FormService } from 'ng2-activiti-form';
import { TaskQueryRequestRepresentationModel } from '../models/filter.model'; import { TaskQueryRequestRepresentationModel } from '../models/filter.model';
@@ -35,9 +31,7 @@ declare let __moduleName: string;
selector: 'activiti-task-details', selector: 'activiti-task-details',
moduleId: __moduleName, moduleId: __moduleName,
templateUrl: './activiti-task-details.component.html', templateUrl: './activiti-task-details.component.html',
styleUrls: ['./activiti-task-details.component.css'], styleUrls: ['./activiti-task-details.component.css']
providers: [ActivitiTaskListService, FormService],
directives: [ActivitiTaskHeader, ActivitiPeople, ActivitiComments, ActivitiChecklist, ActivitiForm]
}) })
export class ActivitiTaskDetails implements OnInit, OnChanges { export class ActivitiTaskDetails implements OnInit, OnChanges {

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

@@ -68,7 +68,7 @@ describe('ActivitiTaskList', () => {
beforeEach(() => { beforeEach(() => {
let activitiSerevice = new ActivitiTaskListService(null); let activitiSerevice = new ActivitiTaskListService(null);
taskList = new ActivitiTaskList(null, null, activitiSerevice); taskList = new ActivitiTaskList(null, activitiSerevice);
}); });
it('should use the default schemaColumn as default', () => { it('should use the default schemaColumn as default', () => {