gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 15:14:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add mandatory group reviewer/approver

Browse Source
This commit is contained in:
Uwe Steinmann 2021-05-14 12:37:37 +02:00
parent 9a2ebf80cc
commit 5a74c3debf
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
op/op.AddDocument.php
View File

@ -205,10 +205,14 @@ if($settings->_workflowMode == 'traditional' || $settings->_workflowMode == 'tra
$mreviewers = getMandatoryReviewers($folder, $user); $mreviewers = getMandatoryReviewers($folder, $user);
if($mreviewers['i']) if($mreviewers['i'])
$reviewers['i'] = array_merge($reviewers['i'], $mreviewers['i']); $reviewers['i'] = array_merge($reviewers['i'], $mreviewers['i']);
if($mreviewers['g'])
$reviewers['g'] = array_merge($reviewers['g'], $mreviewers['g']);
} }
$mapprovers = getMandatoryApprovers($folder, $user); $mapprovers = getMandatoryApprovers($folder, $user);
if($mapprovers['i']) if($mapprovers['i'])
$approvers['i'] = array_merge($approvers['i'], $mapprovers['i']); $approvers['i'] = array_merge($approvers['i'], $mapprovers['i']);
if($mapprovers['g'])
$approvers['g'] = array_merge($approvers['g'], $mapprovers['g']);
if($settings->_workflowMode == 'traditional' && !$settings->_allowReviewerOnly) { if($settings->_workflowMode == 'traditional' && !$settings->_allowReviewerOnly) {
/* Check if reviewers are set but no approvers */ /* Check if reviewers are set but no approvers */

4
op/op.UpdateDocument.php
View File

@ -214,10 +214,14 @@ default:
$mreviewers = getMandatoryReviewers($folder, $user); $mreviewers = getMandatoryReviewers($folder, $user);
if($mreviewers['i']) if($mreviewers['i'])
$reviewers['i'] = array_merge($reviewers['i'], $mreviewers['i']); $reviewers['i'] = array_merge($reviewers['i'], $mreviewers['i']);
if($mreviewers['g'])
$reviewers['g'] = array_merge($reviewers['g'], $mreviewers['g']);
} }
$mapprovers = getMandatoryApprovers($folder, $user); $mapprovers = getMandatoryApprovers($folder, $user);
if($mapprovers['i']) if($mapprovers['i'])
$approvers['i'] = array_merge($approvers['i'], $mapprovers['i']); $approvers['i'] = array_merge($approvers['i'], $mapprovers['i']);
if($mapprovers['g'])
$approvers['g'] = array_merge($approvers['g'], $mapprovers['g']);
} elseif($settings->_workflowMode == 'advanced') { } elseif($settings->_workflowMode == 'advanced') {
if(!$workflows = $user->getMandatoryWorkflows()) { if(!$workflows = $user->getMandatoryWorkflows()) {
if(isset($_POST["workflow"])) if(isset($_POST["workflow"]))