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

[ADF-1149] 'Remove' involved people of a task button is displayed behind the dialog (#2130)

Browse Source 
* Removed mdl dialogs for comments and people
* Removed list-column CSS class from activiti-demo component to show tasks/process list and details in the same row on low resolution screens
This commit is contained in:
Deepak Paul
2017-07-26 14:18:49 +05:30
committed by Eugenio Romano
parent 64389a5577
commit 896149acd8
7 changed files with 34 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ng2-components/ng2-activiti-processlist/src/components/process-instance-details.component.html
View File

@@ -5,9 +5,6 @@
[processInstance]="processInstanceDetails"
(showProcessDiagram)="onShowProcessDiagram($event)">
</adf-process-instance-header>
<div class="mdl-cell mdl-cell--4-col">
<button type="button" md-button md-raised-button (click)="showCommentsDialog()">{{'DETAILS.LABELS.COMMENTS'|translate}}</button>
</div>
<div class="mdl-cell mdl-cell--4-col">
<button id="show-diagram-button" type="button" md-button md-raised-button [disabled]="isDiagramDisabled()" (click)="onShowProcessDiagram(processInstanceId)">{{ 'DETAILS.BUTTON.SHOW_DIAGRAM' | translate }}</button>
</div>
@@ -22,14 +19,12 @@
<div class="mdl-cell mdl-cell--4-col" data-automation-id="header-status" *ngIf="isRunning()">
<button type="button" (click)="cancelProcess()" class="mdl-button">{{ 'DETAILS.BUTTON.CANCEL' | translate }}</button>
</div>
<dialog class="mdl-dialog adf-comments-dialog" #dialogComments>
<div class="mdl-dialog__content">
<md-card>
<md-card-content>
<adf-process-instance-comments #activiticomments
[readOnly]="!isRunning()"
[processInstanceId]="processInstanceDetails.id">
</adf-process-instance-comments>
<br><br>
<button type="button" md-button md-raised-button (click)="closeCommentsDialog()">{{ 'DETAILS.BUTTON.CLOSE' | translate }}</button>
</div>
</dialog>
</md-card-content>
</md-card>
</div>

16
ng2-components/ng2-activiti-processlist/src/components/process-instance-details.component.ts
View File

@@ -43,9 +43,6 @@ export class ProcessInstanceDetailsComponent implements OnChanges {
@ViewChild(ProcessInstanceTasksComponent)
tasksList: ProcessInstanceTasksComponent;
@ViewChild('dialogComments')
commentsDialog: any;
@Input()
showTitle: boolean = true;
@@ -109,19 +106,6 @@ export class ProcessInstanceDetailsComponent implements OnChanges {
}
}
public showCommentsDialog(): void {
if (!this.commentsDialog.nativeElement.showModal) {
dialogPolyfill.registerDialog(this.commentsDialog.nativeElement);
}
this.commentsDialog.nativeElement.showModal();
}
public closeCommentsDialog(): void {
if (this.commentsDialog) {
this.commentsDialog.nativeElement.close();
}
}
isRunning(): boolean {
return this.processInstanceDetails && !this.processInstanceDetails.ended;
}