From 06b8f6989d6b35b9addac52d937c41ff7f5bbdec Mon Sep 17 00:00:00 2001
From: Hamza HRAMCHI <hamza.hramchi@xelians.fr>
Date: Tue, 22 Feb 2022 17:09:04 +0100
Subject: [PATCH] FIX #15943 TIME 0:15 enable stamp after note mode + wording
---
lang/en.json | 2 +-
lang/fr.json | 2 +-
.../app/document/visa-workflow/visa-workflow.component.ts | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lang/en.json b/lang/en.json
index 8afc8d880e..8f8fd98a3c 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -628,6 +628,6 @@
"notificationTemplateRow": "<tr>\n<td><span style=\"font-family: arial,helvetica,sans-serif; font-size: small;\">{{object}}</span></td>\n<td><span style=\"font-family: arial,helvetica,sans-serif;\"><a href=\"{{link}}\">Voir</a></span></td>\n</tr>",
"azure_samlConnection": "Azure SAML",
"cannotSetSignature": "You cannot pre-position a signature for a user with the annotator role",
- "resumeOriginalDoc": "Warning !The return document action resumes the original document"
+ "resumeOriginalDoc": "Warning ! The return document action will use the original document"
}
}
\ No newline at end of file
diff --git a/lang/fr.json b/lang/fr.json
index 39a85260c4..c198a7285f 100755
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -626,7 +626,7 @@
"originaleize": "Taille originale",
"scalingDocWith": "{{value}} % de la largeur du document",
"azure_samlConnection": "Azure SAML",
- "cannotSetSignature": "Vous ne pouvez pas pré-positionner une signature pour un utilisateur ave le rôle annotateur",
+ "cannotSetSignature": "Vous ne pouvez pas pré-positionner une signature pour un utilisateur avec le rôle annotateur",
"resumeOriginalDoc": "Attention ! L'action renvoi de document reprend le document original"
}
}
diff --git a/src/frontend/app/document/visa-workflow/visa-workflow.component.ts b/src/frontend/app/document/visa-workflow/visa-workflow.component.ts
index d10a91d67b..21ee72d593 100644
--- a/src/frontend/app/document/visa-workflow/visa-workflow.component.ts
+++ b/src/frontend/app/document/visa-workflow/visa-workflow.component.ts
@@ -263,7 +263,7 @@ export class VisaWorkflowComponent implements OnInit {
isValidRole(indexWorkflow: any, role: string, currentRole: string) {
if (this.visaWorkflow.filter((item: any, index: any) => index > indexWorkflow && ['stamp'].indexOf(item.role) > -1).length > 0 && ['visa', 'stamp'].indexOf(currentRole) > -1 && ['visa', 'stamp'].indexOf(role) === -1) {
return false;
- } else if (this.visaWorkflow.filter((item: any, index: any) => index < indexWorkflow && ['visa', 'stamp'].indexOf(item.role) === -1).length > 0 && role === 'stamp') {
+ } else if (this.visaWorkflow.filter((item: any, index: any) => index < indexWorkflow && ['visa', 'stamp', 'note'].indexOf(item.role) === -1).length > 0 && role === 'stamp') {
return false;
} else {
return true;
--
GitLab