gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-14 13:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

do not set mandatory reviewer if workflow is traditional_no_review

Browse Source
This commit is contained in:
Uwe Steinmann 2019-09-10 17:43:32 +02:00
parent e24e031b17
commit 875dea5708
1 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
op/op.Ajax.php
View File

@ -683,46 +683,52 @@ switch($command) {
$approvers["i"] = array(); $approvers["i"] = array();
$approvers["g"] = array(); $approvers["g"] = array();
// add mandatory reviewers/approvers if($settings->_workflowMode == 'traditional' || $settings->_workflowMode == 'traditional_only_approval') {
$docAccess = $folder->getReadAccessList($settings->_enableAdminRevApp, $settings->_enableOwnerRevApp); // add mandatory reviewers/approvers
$res=$user->getMandatoryReviewers(); $docAccess = $folder->getReadAccessList($settings->_enableAdminRevApp, $settings->_enableOwnerRevApp);
foreach ($res as $r){ if($settings->_workflowMode == 'traditional') {
$res=$user->getMandatoryReviewers();
foreach ($res as $r){
if ($r['reviewerUserID']!=0){ if ($r['reviewerUserID']!=0){
foreach ($docAccess["users"] as $usr) foreach ($docAccess["users"] as $usr)
if ($usr->getID()==$r['reviewerUserID']){ if ($usr->getID()==$r['reviewerUserID']){
$reviewers["i"][] = $r['reviewerUserID']; $reviewers["i"][] = $r['reviewerUserID'];
break; break;
}
} }
} else if ($r['reviewerGroupID']!=0){
else if ($r['reviewerGroupID']!=0){ foreach ($docAccess["groups"] as $grp)
foreach ($docAccess["groups"] as $grp) if ($grp->getID()==$r['reviewerGroupID']){
if ($grp->getID()==$r['reviewerGroupID']){ $reviewers["g"][] = $r['reviewerGroupID'];
$reviewers["g"][] = $r['reviewerGroupID']; break;
break; }
} }
}
} }
} $res=$user->getMandatoryApprovers();
$res=$user->getMandatoryApprovers(); foreach ($res as $r){
foreach ($res as $r){
if ($r['approverUserID']!=0){ if ($r['approverUserID']!=0){
foreach ($docAccess["users"] as $usr) foreach ($docAccess["users"] as $usr)
if ($usr->getID()==$r['approverUserID']){ if ($usr->getID()==$r['approverUserID']){
$approvers["i"][] = $r['approverUserID']; $approvers["i"][] = $r['approverUserID'];
break; break;
} }
} }
else if ($r['approverGroupID']!=0){ else if ($r['approverGroupID']!=0){
foreach ($docAccess["groups"] as $grp) foreach ($docAccess["groups"] as $grp)
if ($grp->getID()==$r['approverGroupID']){ if ($grp->getID()==$r['approverGroupID']){
$approvers["g"][] = $r['approverGroupID']; $approvers["g"][] = $r['approverGroupID'];
break; break;
} }
}
} }
} elseif($settings->_workflowMode == 'advanced') {
$workflow = $user->getMandatoryWorkflow();
} }
$workflow = $user->getMandatoryWorkflow();
$expires = false; $expires = false;
if($settings->_presetExpirationDate) { if($settings->_presetExpirationDate) {