[ADF-2395] fixed expression change problem when startin a process on demo shell (#3016)

This commit is contained in:
Vito
2018-03-01 11:52:19 +00:00
committed by Eugenio Romano
parent 3df245a58a
commit cef05cbcb9
2 changed files with 6 additions and 2 deletions

View File

@@ -154,7 +154,7 @@
</adf-process-instance-list> </adf-process-instance-list>
<adf-pagination <adf-pagination
*ngIf="processList" *ngIf="showProcessPagination"
[target]="processList" [target]="processList"
(changePageSize)="onChangePageSize($event)" (changePageSize)="onChangePageSize($event)"
[supportedPageSizes]="supportedPages" [supportedPageSizes]="supportedPages"

View File

@@ -147,6 +147,7 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit
dataTasks: ObjectDataTableAdapter; dataTasks: ObjectDataTableAdapter;
dataProcesses: ObjectDataTableAdapter; dataProcesses: ObjectDataTableAdapter;
presetColoum = 'default'; presetColoum = 'default';
showProcessPagination = false;
fieldValidators = [ fieldValidators = [
...FORM_FIELD_VALIDATORS, ...FORM_FIELD_VALIDATORS,
@@ -237,7 +238,8 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit
this.taskPage = 0; this.taskPage = 0;
} }
onTabChange(event: Pagination): void { onTabChange(event: any): void {
this.showProcessPagination = event.index === 1;
this.paginationPageSize = this.preferenceService.paginationSize; this.paginationPageSize = this.preferenceService.paginationSize;
} }
@@ -289,6 +291,7 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit
} }
onSuccessProcessList(event: any): void { onSuccessProcessList(event: any): void {
this.showProcessPagination = true;
this.currentProcessInstanceId = this.processList.getCurrentId(); this.currentProcessInstanceId = this.processList.getCurrentId();
} }
@@ -336,6 +339,7 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit
} }
onStartProcessInstance(instance: ProcessInstance): void { onStartProcessInstance(instance: ProcessInstance): void {
this.showProcessPagination = false;
this.currentProcessInstanceId = instance.id; this.currentProcessInstanceId = instance.id;
this.activitiStartProcess.reset(); this.activitiStartProcess.reset();
this.activitiprocessfilter.selectRunningFilter(); this.activitiprocessfilter.selectRunningFilter();