get approval status before sending notification mails

the approval status was simply not known because part of the code
went into the controller
This commit is contained in:
Uwe Steinmann 2017-06-29 15:34:32 +02:00
parent 7372ccfe11
commit 2a38d713b8

View File

@ -165,26 +165,28 @@ if ($newdocstatus == S_DRAFT_APP) {
$requestUser = $document->getOwner(); $requestUser = $document->getOwner();
if($notifier) { if($notifier) {
$subject = "approval_request_email_subject"; if($docApprovalStatus = $content->getApprovalStatus()) {
$message = "approval_request_email_body"; $subject = "approval_request_email_subject";
$params = array(); $message = "approval_request_email_body";
$params['name'] = $document->getName(); $params = array();
$params['folder_path'] = $folder->getFolderPathPlain(); $params['name'] = $document->getName();
$params['version'] = $version; $params['folder_path'] = $folder->getFolderPathPlain();
$params['username'] = $user->getFullName(); $params['version'] = $version;
$params['sitename'] = $settings->_siteName; $params['username'] = $user->getFullName();
$params['http_root'] = $settings->_httpRoot; $params['sitename'] = $settings->_siteName;
foreach ($docApprovalStatus as $dastat) { $params['http_root'] = $settings->_httpRoot;
foreach ($docApprovalStatus as $dastat) {
if ($dastat["status"] == 0) { if ($dastat["status"] == 0) {
if ($dastat["type"] == 0) { if ($dastat["type"] == 0) {
$approver = $dms->getUser($dastat["required"]); $approver = $dms->getUser($dastat["required"]);
$notifier->toIndividual($document->getOwner(), $approver, $subject, $message, $params); $notifier->toIndividual($document->getOwner(), $approver, $subject, $message, $params);
} elseif ($dastat["type"] == 1) { } elseif ($dastat["type"] == 1) {
$group = $dms->getGroup($dastat["required"]); $group = $dms->getGroup($dastat["required"]);
$notifier->toGroup($document->getOwner(), $group, $subject, $message, $params); $notifier->toGroup($document->getOwner(), $group, $subject, $message, $params);
}
} }
} }
} }