diff --git a/lang/en.json b/lang/en.json index 8afc8d880e09c37262f5340f07158d199b5cefd0..8f8fd98a3ccd15b994dda8e5ca1521bb7bef205b 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 39a85260c4e44be00896bfd8194be7c10e5d64b2..c198a7285f3ea78c0a5f56baa53c44574e253788 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 d10a91d67bcd70543acd7f0db0aa3561b5ab44b8..21ee72d5939cbed3a12394d0af743914766b4108 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;