From 7f3ca75ab397590e830f17c828d19ad3937ee5e2 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Tue, 23 Jul 2019 18:39:14 +0200
Subject: [PATCH] FEAT #11267 TIME 1:30 default action refactoring in basket
list
---
src/frontend/app/actions/actions-list.component.ts | 8 ++++++--
.../view-doc-action/view-doc-action.component.html | 4 ++--
.../basket/list/list-administration.component.ts | 2 +-
src/frontend/app/list/basket-list.component.ts | 2 +-
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/frontend/app/actions/actions-list.component.ts b/src/frontend/app/actions/actions-list.component.ts
index d51221adcf8..16c732f05cc 100644
--- a/src/frontend/app/actions/actions-list.component.ts
+++ b/src/frontend/app/actions/actions-list.component.ts
@@ -71,7 +71,7 @@ export class ActionsListComponent implements OnInit {
return false;
}
- launchEvent(action: any) {
+ launchEvent(action: any, row: any) {
this.arrRes = [];
this.currentAction = action;
@@ -82,10 +82,14 @@ export class ActionsListComponent implements OnInit {
this.contextMenuTitle = '';
this.contextResId = 0;
}
+
+ if (row !== undefined){
+ this.contextMenuTitle = row.alt_identifier;
+ }
if (action.component == 'v1Action' && this.arrRes.length > 1) {
alert(this.lang.actionMassForbidden);
- } else {
+ } else if (action.component !== null) {
this.http.put('../../rest/resourcesList/users/' + this.currentBasketInfo.ownerId + '/groups/' + this.currentBasketInfo.groupId + '/baskets/' + this.currentBasketInfo.basketId + '/lock', { resources: this.arrRes })
.subscribe((data: any) => {
diff --git a/src/frontend/app/actions/view-doc-action/view-doc-action.component.html b/src/frontend/app/actions/view-doc-action/view-doc-action.component.html
index 1290e1391b4..76fa5be15f2 100644
--- a/src/frontend/app/actions/view-doc-action/view-doc-action.component.html
+++ b/src/frontend/app/actions/view-doc-action/view-doc-action.component.html
@@ -1,8 +1,8 @@
-<h1 mat-dialog-title>"{{data.action.label_action}}" : {{data.contextChrono}}
+<h1 mat-dialog-title>{{data.contextChrono}}
<button title="{{lang.close}}" mat-icon-button [mat-dialog-close]="">
<mat-icon class="fa fa-times-circle fa-2x"></mat-icon>
</button>
</h1>
<div style="overflow:auto;height: 100%;width: 100%;">
<pdf-viewer [src]="docUrl" [render-text]="true" [autoresize]="true" [original-size]="false" [show-all]="true"></pdf-viewer>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/frontend/app/administration/basket/list/list-administration.component.ts b/src/frontend/app/administration/basket/list/list-administration.component.ts
index 4332e78fd83..e71dfc53c81 100644
--- a/src/frontend/app/administration/basket/list/list-administration.component.ts
+++ b/src/frontend/app/administration/basket/list/list-administration.component.ts
@@ -136,7 +136,7 @@ export class ListAdministrationComponent implements OnInit {
},
{
id: 'eventVisaMail',
- value: 'visaMail'
+ value: 'signatureBookAction'
},
{
id: 'eventProcessDoc',
diff --git a/src/frontend/app/list/basket-list.component.ts b/src/frontend/app/list/basket-list.component.ts
index 1c450100723..5f0237936c2 100755
--- a/src/frontend/app/list/basket-list.component.ts
+++ b/src/frontend/app/list/basket-list.component.ts
@@ -414,7 +414,7 @@ export class BasketListComponent implements OnInit {
this.toggleRes(thisSelect, row);
setTimeout(() => {
- this.actionsList.launchEvent(action);
+ this.actionsList.launchEvent(action, row);
}, 200);
}
--
GitLab