mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-31 17:38:48 +00:00
Post-merge fixes
This commit is contained in:
@@ -18,13 +18,9 @@
|
||||
import { Component, Input, OnInit, ViewChild, Output, EventEmitter, TemplateRef, OnChanges, SimpleChanges } from '@angular/core';
|
||||
import { AlfrescoTranslationService, AlfrescoAuthenticationService } from 'ng2-alfresco-core';
|
||||
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 { 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';
|
||||
|
||||
|
||||
@@ -35,9 +31,7 @@ declare let __moduleName: string;
|
||||
selector: 'activiti-task-details',
|
||||
moduleId: __moduleName,
|
||||
templateUrl: './activiti-task-details.component.html',
|
||||
styleUrls: ['./activiti-task-details.component.css'],
|
||||
providers: [ActivitiTaskListService, FormService],
|
||||
directives: [ActivitiTaskHeader, ActivitiPeople, ActivitiComments, ActivitiChecklist, ActivitiForm]
|
||||
styleUrls: ['./activiti-task-details.component.css']
|
||||
})
|
||||
export class ActivitiTaskDetails implements OnInit, OnChanges {
|
||||
|
||||
|
@@ -68,7 +68,7 @@ describe('ActivitiTaskList', () => {
|
||||
|
||||
beforeEach(() => {
|
||||
let activitiSerevice = new ActivitiTaskListService(null);
|
||||
taskList = new ActivitiTaskList(null, null, activitiSerevice);
|
||||
taskList = new ActivitiTaskList(null, activitiSerevice);
|
||||
});
|
||||
|
||||
it('should use the default schemaColumn as default', () => {
|
||||
|
Reference in New Issue
Block a user