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
562be619
Verified
Commit
562be619
authored
3 years ago
by
Florian Azizian
Browse files
Options
Downloads
Patches
Plain Diff
FEAT #16982 TIME 0:30 save correct role for otp yousign + error in getbyDocumentId workflow route
parent
1441ef80
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/app/user/controllers/SignatureController.php
+3
-0
3 additions, 0 deletions
src/app/user/controllers/SignatureController.php
src/app/workflow/controllers/WorkflowController.php
+11
-1
11 additions, 1 deletion
src/app/workflow/controllers/WorkflowController.php
with
14 additions
and
1 deletion
src/app/user/controllers/SignatureController.php
+
3
−
0
View file @
562be619
...
@@ -249,6 +249,9 @@ class SignatureController
...
@@ -249,6 +249,9 @@ class SignatureController
}
}
$validModes
=
CoreConfigModel
::
getSignatureModes
();
$validModes
=
CoreConfigModel
::
getSignatureModes
();
array_push
(
$validModes
,
[
'id'
=>
'otp_visa_yousign'
]);
array_push
(
$validModes
,
[
'id'
=>
'otp_sign_yousign'
]);
foreach
(
$validModes
as
$validMode
)
{
foreach
(
$validModes
as
$validMode
)
{
if
(
$validMode
[
'id'
]
==
$args
[
'mode'
])
{
if
(
$validMode
[
'id'
]
==
$args
[
'mode'
])
{
return
true
;
return
true
;
...
...
This diff is collapsed.
Click to expand it.
src/app/workflow/controllers/WorkflowController.php
+
11
−
1
View file @
562be619
...
@@ -24,6 +24,7 @@ use Respect\Validation\Validator;
...
@@ -24,6 +24,7 @@ use Respect\Validation\Validator;
use
Slim\Http\Request
;
use
Slim\Http\Request
;
use
Slim\Http\Response
;
use
Slim\Http\Response
;
use
User\models\UserModel
;
use
User\models\UserModel
;
use
Workflow\models\WorkflowExternalInformationModel
;
use
Workflow\models\WorkflowModel
;
use
Workflow\models\WorkflowModel
;
class
WorkflowController
class
WorkflowController
...
@@ -43,9 +44,18 @@ class WorkflowController
...
@@ -43,9 +44,18 @@ class WorkflowController
$value
[
'process_date'
]
=
$date
->
format
(
'd-m-Y H:i'
);
$value
[
'process_date'
]
=
$date
->
format
(
'd-m-Y H:i'
);
}
}
if
(
in_array
(
$value
[
'signature_mode'
],
[
'otp_visa_yousign'
,
'otp_sign_yousign'
]))
{
$workflowExternalInformations
=
WorkflowExternalInformationModel
::
getByWorkflowId
([
'select'
=>
[
'firstname'
,
'lastname'
],
'workflowId'
=>
$value
[
'id'
]]);
if
(
!
empty
(
$workflowExternalInformations
))
{
$userDisplay
=
"
{
$workflowExternalInformations
[
'firstname'
]
}
{
$workflowExternalInformations
[
'lastname'
]
}
"
;
}
}
else
{
$userDisplay
=
UserModel
::
getLabelledUserById
([
'id'
=>
$value
[
'user_id'
]]);
}
$workflow
[]
=
[
$workflow
[]
=
[
'userId'
=>
$value
[
'user_id'
],
'userId'
=>
$value
[
'user_id'
],
'userDisplay'
=>
U
ser
Model
::
getLabelledUserById
([
'id'
=>
$value
[
'user_id'
]])
,
'userDisplay'
=>
$u
ser
Display
,
'mode'
=>
$value
[
'mode'
],
'mode'
=>
$value
[
'mode'
],
'signatureMode'
=>
$value
[
'signature_mode'
],
'signatureMode'
=>
$value
[
'signature_mode'
],
'order'
=>
$value
[
'order'
],
'order'
=>
$value
[
'order'
],
...
...
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