Merge development branch

# Conflicts:
#	ng2-components/ng2-activiti-tasklist/index.ts
#
ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.com
ponent.spec.ts
#
ng2-components/ng2-activiti-tasklist/src/components/activiti-task-detail
s.component.ts
#
ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.co
mponent.spec.ts
#	ng2-components/ng2-alfresco-login/demo/package.json
This commit is contained in:
Denys Vuika
2016-09-26 09:55:38 +01:00
61 changed files with 1891 additions and 153 deletions

View File

@@ -86,6 +86,13 @@ export class ActivitiTaskList implements OnInit, OnChanges {
}
}
public reload() {
if (this.taskFilter) {
let requestNode = this.convertTaskUserToTaskQuery(this.taskFilter);
this.load(new TaskQueryRequestRepresentationModel(requestNode));
}
}
public load(requestNode: TaskQueryRequestRepresentationModel) {
this.activiti.getTotalTasks(requestNode).subscribe(
(res) => {
@@ -136,7 +143,7 @@ export class ActivitiTaskList implements OnInit, OnChanges {
/**
* Select the first task of a tasklist if present
*/
private selectFirstTask() {
selectFirstTask() {
if (!this.isTaskListEmpty()) {
this.currentTaskId = this.data.getRows()[0].getValue('id');
} else {