inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-26 17:24:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-2118] Process Initiator should be able to complete a task (#2951)

Browse Source 
* [ADF-2118] Process Initiator should be able to complete a task.

* Fixed Process Initiator should be able to complete a task.

* * Fixed Process Initiator should be able to complete a task.

* * Removed extra space
This commit is contained in:
siva kumar 2018-02-15 15:48:41 +05:30 committed by Eugenio Romano
parent 6f81d7729e
commit f828e8e847
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
demo-shell/src/app/components/process-service/process-service.component.ts
View File

@ -369,12 +369,18 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit
this.taskPage = this.taskListPagination.current - 1;
if (this.taskList) {
this.taskList.reload();
} else {
this.navigateToProcess();
}
if (this.processList) {
this.processList.reload();
}
}
navigateToProcess(): void {
this.router.navigate([`/activiti/apps/${this.appId}/processes/`]);
}
onContentClick(content: any): void {
this.fileShowed = true;
this.content = content.contentBlob;

4
lib/process-services/task-list/components/task-details.component.html
View File

@ -28,8 +28,8 @@
[showTitle]="showFormTitle"
[showRefreshButton]="showFormRefreshButton"
[showCompleteButton]="showFormCompleteButton"
[disableCompleteButton]="!isAssignedToMe()"
[showSaveButton]="showFormSaveButton"
[disableCompleteButton]="!isCompleteButtonVisible()"
[showSaveButton]="isSaveButtonVisible()"
[readOnly]="readOnlyForm"
[fieldValidators]="fieldValidators"
(formSaved)='onFormSaved($event)'

16
lib/process-services/task-list/components/task-details.component.ts
View File

@ -284,6 +284,22 @@ export class TaskDetailsComponent implements OnInit, OnChanges {
return this.taskDetails.assignee.email === this.authService.getBpmUsername();
}
isCompleteButtonVisible(): boolean {
return this.isAssignedToMe() || this.canInitiatorComplete();
}
canInitiatorComplete(): boolean {
return this.taskDetails.initiatorCanCompleteTask;
}
isSaveButtonVisible(): boolean {
return this.hasSaveButton() && (!this.canInitiatorComplete() || this.isAssignedToMe());
}
hasSaveButton(): boolean {
return this.showFormSaveButton;
}
/**
* Retrieve the next open task
* @param processInstanceId