Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Maarch
MaarchCourrier
Commits
6aaa6dfa
Commit
6aaa6dfa
authored
Aug 24, 2021
by
Guillaume Heurtier
Browse files
FIX #17812 TIME 0:40 delegate can give parallel opinion
parent
930a746a
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/app/action/controllers/ActionMethodController.php
View file @
6aaa6dfa
...
...
@@ -944,13 +944,13 @@ class ActionMethodController
public
static
function
giveOpinionParallel
(
array
$args
)
{
ValidatorModel
::
notEmpty
(
$args
,
[
'resId'
]);
ValidatorModel
::
intVal
(
$args
,
[
'resId'
]);
ValidatorModel
::
notEmpty
(
$args
,
[
'resId'
,
'userId'
]);
ValidatorModel
::
intVal
(
$args
,
[
'resId'
,
'userId'
]);
$currentStep
=
ListInstanceModel
::
get
([
'select'
=>
[
'listinstance_id'
,
'item_id'
],
'where'
=>
[
'res_id = ?'
,
'difflist_type = ?'
,
'item_id = ?'
,
'item_mode in (?)'
],
'data'
=>
[
$args
[
'resId'
],
'entity_id'
,
$
GLOBALS
[
'i
d'
],
[
'avis'
,
'avis_copy'
,
'avis_info'
]],
'data'
=>
[
$args
[
'resId'
],
'entity_id'
,
$
args
[
'userI
d'
],
[
'avis'
,
'avis_copy'
,
'avis_info'
]],
'limit'
=>
1
]);
...
...
src/app/action/controllers/PreProcessActionController.php
View file @
6aaa6dfa
...
...
@@ -1430,7 +1430,7 @@ class PreProcessActionController
$isInCircuit
=
ListInstanceModel
::
get
([
'select'
=>
[
1
],
'where'
=>
[
'res_id = ?'
,
'difflist_type = ?'
,
'process_date is null'
,
'item_id = ?'
,
'item_mode = ?'
],
'data'
=>
[
$resId
,
'entity_id'
,
$
GLOBALS
[
'i
d'
],
'avis'
]
'data'
=>
[
$resId
,
'entity_id'
,
$
args
[
'userI
d'
],
'avis'
]
]);
if
(
empty
(
$isInCircuit
))
{
$resourcesInformation
[
'error'
][]
=
[
'alt_identifier'
=>
$resource
[
'alt_identifier'
],
'res_id'
=>
$resId
,
'reason'
=>
'userNotInDiffusionList'
];
...
...
src/app/resource/controllers/ResourceListController.php
View file @
6aaa6dfa
...
...
@@ -505,7 +505,7 @@ class ResourceListController
}
if
(
!
empty
(
$method
))
{
$methodResponse
=
ActionMethodController
::
$method
([
'resId'
=>
$resId
,
'data'
=>
$body
[
'data'
],
'note'
=>
$body
[
'note'
],
'action'
=>
$action
,
'resources'
=>
$resourcesForAction
]);
$methodResponse
=
ActionMethodController
::
$method
([
'resId'
=>
$resId
,
'data'
=>
$body
[
'data'
],
'note'
=>
$body
[
'note'
],
'action'
=>
$action
,
'resources'
=>
$resourcesForAction
,
'userId'
=>
$aArgs
[
'userId'
]
]);
if
(
!
empty
(
$methodResponse
[
'errors'
]))
{
if
(
empty
(
$methodResponses
[
'errors'
]))
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment