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

* [bug#56673,done,0.5h] fix mail subject error.

Browse Source
This commit is contained in:
tianshujie
2024-11-04 08:26:08 +08:00
committed by 刘刚
parent 20e259ad5d
commit 2e29ab25b6
6 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/lang/de.php
+4 -4
View File
@@ -336,10 +336,10 @@ $lang->doc->customShowLibsList['children'] = 'Display Child-category Documents';
$lang->doc->customShowLibsList['unclosed'] = "Display Active {$lang->executionCommon}s Only";
$lang->doc->mail = new stdclass();
$lang->doc->mail->create = new stdclass();
$lang->doc->mail->edit = new stdclass();
$lang->doc->mail->create->title = "%s created document #%s:%s";
$lang->doc->mail->edit->title = "%s edited document #%s:%s";
$lang->doc->mail->releasedDoc = new stdclass();
$lang->doc->mail->edit = new stdclass();
$lang->doc->mail->releasedDoc->title = "%s released document #%s:%s";
$lang->doc->mail->edit->title = "%s edited document #%s:%s";
$lang->doc->confirmDelete = "Möchten Sie dieses Dokument löschen?";
$lang->doc->confirmDeleteLib = "Möchten Sie diese Bibliothek löschen?";
module/doc/lang/en.php
+4 -4
View File
@@ -336,10 +336,10 @@ $lang->doc->customShowLibsList['children'] = 'Display Child-category Documents';
$lang->doc->customShowLibsList['unclosed'] = "Display Active {$lang->executionCommon}s Only";
$lang->doc->mail = new stdclass();
$lang->doc->mail->create = new stdclass();
$lang->doc->mail->edit = new stdclass();
$lang->doc->mail->create->title = "%s created document #%s:%s";
$lang->doc->mail->edit->title = "%s edited document #%s:%s";
$lang->doc->mail->releasedDoc = new stdclass();
$lang->doc->mail->edit = new stdclass();
$lang->doc->mail->releasedDoc->title = "%s released document #%s:%s";
$lang->doc->mail->edit->title = "%s edited document #%s:%s";
$lang->doc->confirmDelete = "Do you want to delete this document?";
$lang->doc->confirmDeleteLib = "Do you want to delete this document library?";
module/doc/lang/fr.php
+4 -4
View File
@@ -336,10 +336,10 @@ $lang->doc->customShowLibsList['children'] = 'Montrer sous-catégorie de Documen
$lang->doc->customShowLibsList['unclosed'] = "Montrer {$lang->executionCommon}s actifs seulement";
$lang->doc->mail = new stdclass();
$lang->doc->mail->create = new stdclass();
$lang->doc->mail->edit = new stdclass();
$lang->doc->mail->create->title = "%s created document #%s:%s";
$lang->doc->mail->edit->title = "%s edited document #%s:%s";
$lang->doc->mail->releasedDoc = new stdclass();
$lang->doc->mail->edit = new stdclass();
$lang->doc->mail->releasedDoc->title = "%s released document #%s:%s";
$lang->doc->mail->edit->title = "%s edited document #%s:%s";
$lang->doc->confirmDelete = "Voulez-vous supprimer ce document ?";
$lang->doc->confirmDeleteLib = "Voulez-vous supprimer cette Bibliothèque ?";
module/doc/lang/zh-cn.php
+4 -4
View File
@@ -336,10 +336,10 @@ $lang->doc->customShowLibsList['children'] = '显示子分类的文档';
$lang->doc->customShowLibsList['unclosed'] = '只显示未关闭的' . $lang->executionCommon;
$lang->doc->mail = new stdclass();
$lang->doc->mail->create = new stdclass();
$lang->doc->mail->edit = new stdclass();
$lang->doc->mail->create->title = "%s创建了文档 #%s:%s";
$lang->doc->mail->edit->title = "%s编辑了文档 #%s:%s";
$lang->doc->mail->releasedDoc = new stdclass();
$lang->doc->mail->edit = new stdclass();
$lang->doc->mail->releasedDoc->title = "%s发布了文档 #%s:%s";
$lang->doc->mail->edit->title = "%s编辑了文档 #%s:%s";
$lang->doc->confirmDelete = "您确定删除该文档吗？";
$lang->doc->confirmDeleteLib = "您确定删除该文档库吗？";
module/mail/model.php
+1 -1
View File
@@ -663,7 +663,7 @@ class mailModel extends model
{
$this->app->loadLang('doc');
if($actionType == 'created') $titleType = 'create';
if($actionType == 'releaseddoc') $titleType = 'releasedDoc';
return sprintf($this->lang->doc->mail->{$titleType}->title, $this->app->user->realname, $object->id, $object->title);
}
module/message/model.php
+2 -3
View File
@@ -249,11 +249,10 @@ class messageModel extends model
if(empty($toList) && $objectType == 'mr') $toList = $object->createdBy . ',' . $object->assignee;
if(empty($toList) and $objectType == 'demandpool') $toList = trim($object->owner, ',') . ',' . trim($object->reviewer, ',');
if(empty($toList) and $objectType == 'feedback') $toList = $object->openedBy;
if(empty($toList) && $objectType == 'doc') $toList = $object->mailto;
if(empty($toList) && $objectType == 'release')
if(empty($toList) && in_array($objectType, array('release', 'doc')))
{
list($toList, $ccList) = $this->loadModel($objectType)->getToAndCcList($object);
$toList = $toList . $ccList;
$toList = $toList . ',' . $ccList;
}
if(empty($toList) && $objectType == 'task' && $object->mode == 'multi')
{