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

Merge branch 'feedback_1954' into 'master'

Browse Source 
* Resolve feedback#1954

See merge request easycorp/zentaopms!6763
This commit is contained in:
王怡栋
2023-01-13 07:07:42 +00:00
parent 7b83232b17 d31c104de2
commit 879b06b074
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/message/model.php
+10 -2
View File
@@ -144,7 +144,7 @@ class messageModel extends model
$table = $this->config->objectTables[$objectType];
$field = $this->config->action->objectNameFields[$objectType];
$object = $this->dao->select('*')->from($table)->where('id')->eq($objectID)->fetch();
$toList = $this->getToList($object, $objectType);
$toList = $this->getToList($object, $objectType, $actionID);
if(empty($toList)) return false;
if($toList == $actor) return false;
@@ -181,10 +181,11 @@ class messageModel extends model
*
* @param object $object
* @param string $objectType
* @param int $actionID
* @access public
* @return string
*/
public function getToList($object, $objectType)
public function getToList($object, $objectType, $actionID = 0)
{
$toList = '';
if(!empty($object->assignedTo)) $toList = $object->assignedTo;
@@ -211,6 +212,13 @@ class messageModel extends model
if($toList == 'closed') $toList = '';
if($objectType == 'feedback' and $object->status == 'replied') $toList = ',' . $object->openedBy . ',';
if($objectType == 'story' and $actionID)
{
$action = $this->loadModel('action')->getById($actionID);
list($toList, $ccList) = $this->loadModel($objectType)->getToAndCcList($object, $action->action);
$toList = $toList . $ccList;
}
return $toList;
}
module/webhook/model.php
+1 -1
View File
@@ -627,7 +627,7 @@ class webhookModel extends model
if(empty($table)) return false;
$object = $this->dao->select('*')->from($table)->where('id')->eq($action->objectID)->fetch();
$toList = $this->loadModel('message')->getToList($object, $action->objectType);
$toList = $this->loadModel('message')->getToList($object, $action->objectType, $actionID);
if(!empty($object->mailto)) $toList .= ',' . $object->mailto;
if(empty($toList)) return false;