Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MaarchParapheur
Manage
Activity
Members
Plan
Redmine
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maarch
MaarchParapheur
Commits
06b8f698
Commit
06b8f698
authored
3 years ago
by
Hamza HRAMCHI
Browse files
Options
Downloads
Patches
Plain Diff
FIX #15943 TIME 0:15 enable stamp after note mode + wording
parent
852e8311
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
lang/en.json
+1
-1
1 addition, 1 deletion
lang/en.json
lang/fr.json
+1
-1
1 addition, 1 deletion
lang/fr.json
src/frontend/app/document/visa-workflow/visa-workflow.component.ts
+1
-1
1 addition, 1 deletion
...end/app/document/visa-workflow/visa-workflow.component.ts
with
3 additions
and
3 deletions
lang/en.json
+
1
−
1
View file @
06b8f698
...
...
@@ -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
This diff is collapsed.
Click to expand it.
lang/fr.json
+
1
−
1
View file @
06b8f698
...
...
@@ -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 ave
c
le rôle annotateur"
,
"resumeOriginalDoc"
:
"Attention ! L'action renvoi de document reprend le document original"
}
}
This diff is collapsed.
Click to expand it.
src/frontend/app/document/visa-workflow/visa-workflow.component.ts
+
1
−
1
View file @
06b8f698
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment