Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Merge task #110041, send message for demand.

Browse Source
This commit is contained in:
hufangzhou
2024-02-04 15:45:46 +08:00
parent 6bfb2d877d
commit 0bb5a88fb4
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/xuanxuan/extension/xuan/message/ext/model/class/xuanxuan.class.php
+10
View File
@@ -126,6 +126,16 @@ class xuanxuanMessage extends messageModel
if(!empty($object->owner)) $target .= trim($object->owner, ',');
if(!empty($object->reviewer)) $target .= ',' . trim($object->reviewer, ',');
}
elseif($objectType == 'demand')
{
$target .= $object->createdBy;
if(!empty($object->assignedTo)) $target .= $object->assignedTo == 'closed' ? '' : $object->assignedTo;
if(!empty($object->mailto)) $target .= ",{$object->mailto}";
$reviewers = $this->loadModel('demand')->getReviewerPairs($object->id, $object->version);
$reviewers = array_keys($reviewers);
if($reviewers) $target .= ',' . implode(',', $reviewers);
$target = trim($target, ',');
}
else
{
$subcontent->parentType = $objectType;
module/message/model.php
+12
View File
@@ -226,6 +226,18 @@ class messageModel extends model
$toList = implode(',', $toList);
}
if(empty($toList) and $objectType == 'demand' and $this->config->edition == 'ipd')
{
$toList = $object->assignedTo;
$toList .= ',' . str_replace(' ', '', trim($object->mailto, ','));
$toList .= ",$object->createdBy";
$reviewers = $this->loadModel('demand')->getReviewerPairs($object->id, $object->version);
$reviewers = array_keys($reviewers);
if($reviewers) $toList .= ',' . implode(',', $reviewers);
$toList = trim($toList, ',');
}
return $toList;
}