Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

This commit is contained in:
Uwe Steinmann 2021-02-01 13:15:40 +01:00
commit 2fe261492c

View File

@ -505,6 +505,8 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
$notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); $notifier->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
} }
/* Get workflow from controller in case it was modified in a hook */
$workflow = $controller->getParam('workflow');
if($workflow && $settings->_enableNotificationWorkflow) { if($workflow && $settings->_enableNotificationWorkflow) {
$subject = "request_workflow_action_email_subject"; $subject = "request_workflow_action_email_subject";
$message = "request_workflow_action_email_body"; $message = "request_workflow_action_email_body";
@ -531,6 +533,11 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
if($settings->_enableNotificationAppRev) { if($settings->_enableNotificationAppRev) {
/* Reviewers and approvers will be informed about the new document */ /* Reviewers and approvers will be informed about the new document */
/* Get reviewers and approvers from controller in case it was
* modified in a hook
*/
$reviewers = $controller->getParam('reviewers');
$approvers = $controller->getParam('approvers');
if($reviewers['i'] || $reviewers['g']) { if($reviewers['i'] || $reviewers['g']) {
$subject = "review_request_email_subject"; $subject = "review_request_email_subject";
$message = "review_request_email_body"; $message = "review_request_email_body";