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

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

Browse Source
This commit is contained in:
Uwe Steinmann 2021-03-10 09:15:57 +01:00
commit 58f349e295
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
op/op.Ajax.php
View File

@ -817,6 +817,7 @@ switch($command) {
$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'); $workflow = $controller->getParam('workflow');
if($workflow && $settings->_enableNotificationWorkflow) { if($workflow && $settings->_enableNotificationWorkflow) {
$subject = "request_workflow_action_email_subject"; $subject = "request_workflow_action_email_subject";

7
op/op.UpdateDocument.php
View File

@ -360,6 +360,8 @@ default:
// if ($user->getID() != $document->getOwner()->getID()) // if ($user->getID() != $document->getOwner()->getID())
// $notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER); // $notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
/* 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";
@ -386,6 +388,11 @@ default:
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";