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-1950] Not able to open an attached file within a Task. (#2654)

Browse Source 
* [ADF-1950] Not able to open an attached file within a Task.

* Changed data-column key 'icon' to 'image' in task/process  attachment file component.
* Refactored activiti-component.
* Used Adf-viewer to view the attached documents.

* [ADF-1950] Not able to open an attached file within a Task.

* Centralized the use of the adf-viewer component in the activiti component (demo shell folder).
This commit is contained in:
siva kumar
2017-11-20 17:42:21 +05:30
committed by Eugenio Romano
parent edaa442e18
commit 47f5a5ddfb
5 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
demo-shell/src/app/components/activiti/activiti.component.html
View File

@@ -66,7 +66,7 @@
[taskId]="currentTaskId" [taskId]="currentTaskId"
[fieldValidators]="fieldValidators" [fieldValidators]="fieldValidators"
(formCompleted)="onFormCompleted($event)" (formCompleted)="onFormCompleted($event)"
(formContentClicked)="onFormContentClick($event)" (formContentClicked)="onContentClick($event)"
(taskCreated)="onTaskCreated($event)" (taskCreated)="onTaskCreated($event)"
(assignTask)="onAssignTask()" (assignTask)="onAssignTask()"
(taskDeleted)="onTaskDeleted($event)"> (taskDeleted)="onTaskDeleted($event)">
@@ -86,7 +86,8 @@
<mat-card> <mat-card>
<mat-card-content> <mat-card-content>
<adf-task-attachment-list <adf-task-attachment-list
[taskId]="currentTaskId"> [taskId]="currentTaskId"
(attachmentClick)="onContentClick($event)">
</adf-task-attachment-list> </adf-task-attachment-list>
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>
@@ -172,10 +173,10 @@
<hr> <hr>
</div> </div>
<mat-card> <mat-card>
<mat-card-content> <mat-card-content>
<adf-process-attachment-list <adf-process-attachment-list
[processInstanceId]="currentProcessInstanceId"> [processInstanceId]="currentProcessInstanceId"
(attachmentClick)="onContentClick($event)">
</adf-process-attachment-list> </adf-process-attachment-list>
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>

2
demo-shell/src/app/components/activiti/activiti.component.ts
View File

@@ -388,7 +388,7 @@ export class ActivitiComponent implements AfterViewInit, OnDestroy, OnInit {
} }
} }
onFormContentClick(content: any): void { onContentClick(content: any): void {
this.fileShowed = true; this.fileShowed = true;
this.content = content.contentBlob; this.content = content.contentBlob;
this.contentName = content.name; this.contentName = content.name;

2
lib/process-services/attachment/process-attachment-list.component.html
View File

@@ -13,7 +13,7 @@
</adf-empty-list> </adf-empty-list>
<data-columns> <data-columns>
<data-column key="icon" type="icon" srTitle="Thumbnail" [sortable]="false"></data-column> <data-column key="icon" type="image" srTitle="ADF_PROCESS_LIST.PROPERTIES.THUMBNAIL" [sortable]="false"></data-column>
<data-column key="name" type="text" title="{{'ADF_PROCESS_LIST.PROPERTIES.NAME' | translate}}" class="full-width ellipsis-cell" [sortable]="true"></data-column> <data-column key="name" type="text" title="{{'ADF_PROCESS_LIST.PROPERTIES.NAME' | translate}}" class="full-width ellipsis-cell" [sortable]="true"></data-column>
<data-column key="created" type="date" format="shortDate" title="{{'ADF_PROCESS_LIST.PROPERTIES.CREATED' | translate}}"></data-column> <data-column key="created" type="date" format="shortDate" title="{{'ADF_PROCESS_LIST.PROPERTIES.CREATED' | translate}}"></data-column>
</data-columns> </data-columns>

2
lib/process-services/attachment/task-attachment-list.component.html
View File

@@ -11,7 +11,7 @@
</div> </div>
</adf-empty-list> </adf-empty-list>
<data-columns> <data-columns>
<data-column key="icon" type="icon" srTitle="ADF_TASK_LIST.PROPERTIES.THUMBNAIL" [sortable]="false"></data-column> <data-column key="icon" type="image" srTitle="ADF_TASK_LIST.PROPERTIES.THUMBNAIL" [sortable]="false"></data-column>
<data-column key="name" type="text" title="ADF_TASK_LIST.PROPERTIES.NAME" class="full-width ellipsis-cell" [sortable]="true"></data-column> <data-column key="name" type="text" title="ADF_TASK_LIST.PROPERTIES.NAME" class="full-width ellipsis-cell" [sortable]="true"></data-column>
<data-column key="created" type="date" format="shortDate" title="ADF_TASK_LIST.PROPERTIES.CREATED"></data-column> <data-column key="created" type="date" format="shortDate" title="ADF_TASK_LIST.PROPERTIES.CREATED"></data-column>
</data-columns> </data-columns>

1
lib/process-services/i18n/en.json
View File

@@ -176,6 +176,7 @@
"PROPERTIES": { "PROPERTIES": {
"PROCESS_NAME": "Process", "PROCESS_NAME": "Process",
"NAME": "Name", "NAME": "Name",
"THUMBNAIL": "Thumbnail",
"STATUS": "Status", "STATUS": "Status",
"DUE_DATE": "Due Date", "DUE_DATE": "Due Date",
"DUE_DATE_DEFAULT": "No date", "DUE_DATE_DEFAULT": "No date",