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

[ADF-3111] pagination is not showed when automation test are running (#3420)

Browse Source
This commit is contained in:
Vito 2018-05-31 17:10:23 +01:00 committed by Eugenio Romano
parent ed1b30169a
commit 3f332997c6
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demo-shell/src/app/components/process-service/process-service.component.html
View File

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

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

@ -143,7 +143,6 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit
flag = true; flag = true;
presetColoum = 'default'; presetColoum = 'default';
showProcessPagination = false;
showTaskTab = true; showTaskTab = true;
showProcessTab = false; showProcessTab = false;
@ -244,7 +243,6 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit
onTabChange(event: any): void { onTabChange(event: any): void {
const index = event.index; const index = event.index;
this.showProcessPagination = index === PROCESS_ROUTE;
if (index === TASK_ROUTE) { if (index === TASK_ROUTE) {
this.showTaskTab = event.index === this.tabs.tasks; this.showTaskTab = event.index === this.tabs.tasks;
this.relocateLocationToTask(); this.relocateLocationToTask();
@ -307,7 +305,6 @@ 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();
} }
@ -351,7 +348,6 @@ 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();
@ -390,7 +386,7 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit
} }
relocateLocationToProcess(): void { relocateLocationToProcess(): void {
this.location.go(`/activiti/apps/${this.appId || 0}/processes/${this.processFilter.id}`); this.location.go(`/activiti/apps/${this.appId || 0}/processes/${this.processFilter ? this.processFilter.id : 0}`);
} }
relocateLocationToTask(): void { relocateLocationToTask(): void {