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

check if group recipient is already in list of ind. recipients, check for reviewer only

Browse Source
This commit is contained in:
Uwe Steinmann 2018-03-20 12:16:51 +01:00
parent 77c5645ccc
commit 08e3a5aca3
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
op/op.CheckInDocument.php
View File

@ -167,6 +167,12 @@ else
}
}
}
if($settings->_workflowMode == 'traditional' && !$settings->_allowReviewerOnly) {
/* Check if reviewers are send but no approvers */
if(($reviewers["i"] || $reviewers["g"]) && !$approvers["i"] && !$approvers["g"]) {
UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("error_uploading_reviewer_only"));
}
}
} elseif($settings->_workflowMode == 'advanced') {
if(!$workflow = $user->getMandatoryWorkflow()) {
if(isset($_POST["workflow"]))
@ -198,7 +204,8 @@ else
foreach($members as $member) {
/* Do not add the uploader itself and reviewers */
if(!$settings->_enableFilterReceipt || ($member->getID() != $user->getID() && !in_array($member->getID(), $reviewers['i'])))
$recipients["i"][] = $member->getID();
if(!in_array($member->getID(), $recipients["i"]))
$recipients["i"][] = $member->getID();
}
}
}

9
op/op.UpdateDocument.php
View File

@ -271,6 +271,12 @@ default:
}
}
}
if($settings->_workflowMode == 'traditional' && !$settings->_allowReviewerOnly) {
/* Check if reviewers are send but no approvers */
if(($reviewers["i"] || $reviewers["g"]) && !$approvers["i"] && !$approvers["g"]) {
UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("error_uploading_reviewer_only"));
}
}
} elseif($settings->_workflowMode == 'advanced') {
if(!$workflows = $user->getMandatoryWorkflows()) {
if(isset($_POST["workflow"]))
@ -310,7 +316,8 @@ default:
foreach($members as $member) {
/* Do not add the uploader itself and approvers */
if(!$settings->_enableFilterReceipt || ($member->getID() != $user->getID() && !in_array($member->getID(), $reviewers['i'])))
$recipients["i"][] = $member->getID();
if(!in_array($member->getID(), $recipients["i"]))
$recipients["i"][] = $member->getID();
}
}
}