Merge branch 'development' into dev-denys-1152

This commit is contained in:
Denys Vuika
2017-01-06 10:03:40 +00:00
committed by GitHub
6 changed files with 72 additions and 11 deletions

View File

@@ -38,6 +38,9 @@ export class ActivitiChecklist implements OnInit, OnChanges {
@Input()
readOnly: boolean = false;
@Input()
assignee: string;
@ViewChild('dialog')
dialog: any;
@@ -105,7 +108,11 @@ export class ActivitiChecklist implements OnInit, OnChanges {
}
public add() {
let newTask = new TaskDetailsModel({name: this.taskName, parentTaskId: this.taskId, assignee: {id: '1'}});
let newTask = new TaskDetailsModel({
name: this.taskName,
parentTaskId: this.taskId,
assignee: { id: this.assignee }
});
this.activitiTaskList.addTask(newTask).subscribe(
(res: TaskDetailsModel) => {
this.checklist.push(res);
@@ -114,7 +121,6 @@ export class ActivitiChecklist implements OnInit, OnChanges {
this.logService.error(err);
}
);
this.cancel();
}