From 2a38d713b840c8236363e97601405038d3bbc4ed Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 29 Jun 2017 15:34:32 +0200 Subject: [PATCH] get approval status before sending notification mails the approval status was simply not known because part of the code went into the controller --- op/op.ReviewDocument.php | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php index 45c36916e..3a4c91e76 100644 --- a/op/op.ReviewDocument.php +++ b/op/op.ReviewDocument.php @@ -165,26 +165,28 @@ if ($newdocstatus == S_DRAFT_APP) { $requestUser = $document->getOwner(); if($notifier) { - $subject = "approval_request_email_subject"; - $message = "approval_request_email_body"; - $params = array(); - $params['name'] = $document->getName(); - $params['folder_path'] = $folder->getFolderPathPlain(); - $params['version'] = $version; - $params['username'] = $user->getFullName(); - $params['sitename'] = $settings->_siteName; - $params['http_root'] = $settings->_httpRoot; - foreach ($docApprovalStatus as $dastat) { - - if ($dastat["status"] == 0) { - if ($dastat["type"] == 0) { + if($docApprovalStatus = $content->getApprovalStatus()) { + $subject = "approval_request_email_subject"; + $message = "approval_request_email_body"; + $params = array(); + $params['name'] = $document->getName(); + $params['folder_path'] = $folder->getFolderPathPlain(); + $params['version'] = $version; + $params['username'] = $user->getFullName(); + $params['sitename'] = $settings->_siteName; + $params['http_root'] = $settings->_httpRoot; + foreach ($docApprovalStatus as $dastat) { + + if ($dastat["status"] == 0) { + if ($dastat["type"] == 0) { - $approver = $dms->getUser($dastat["required"]); - $notifier->toIndividual($document->getOwner(), $approver, $subject, $message, $params); - } elseif ($dastat["type"] == 1) { - - $group = $dms->getGroup($dastat["required"]); - $notifier->toGroup($document->getOwner(), $group, $subject, $message, $params); + $approver = $dms->getUser($dastat["required"]); + $notifier->toIndividual($document->getOwner(), $approver, $subject, $message, $params); + } elseif ($dastat["type"] == 1) { + + $group = $dms->getGroup($dastat["required"]); + $notifier->toGroup($document->getOwner(), $group, $subject, $message, $params); + } } } }