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

Merge branch 'sugon'

Browse Source
This commit is contained in:
liyuchun
2021-12-01 16:48:00 +08:00
parent 04e16ded07 d11f6e9b6f
commit f6301e4c9a
101 changed files with 7682 additions and 690 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
module/message/config.php
View File

@@ -11,6 +11,7 @@ $config->message->objectTypes['testtask'] = array('opened', 'edited', 'starte
$config->message->objectTypes['todo'] = array('opened', 'edited');
$config->message->objectTypes['doc'] = array('created', 'edited');
$config->message->objectTypes['release'] = array('opened', 'edited');
$config->message->objectTypes['mr'] = array('compilepass', 'compilefail');
$config->message->available = array();
$config->message->available['mail']['story'] = $config->message->objectTypes['story'];
@@ -19,6 +20,7 @@ $config->message->available['mail']['bug'] = $config->message->objectTypes[
$config->message->available['mail']['testtask'] = array('opened', 'edited', 'closed');
$config->message->available['mail']['doc'] = $config->message->objectTypes['doc'];
$config->message->available['mail']['release'] = $config->message->objectTypes['release'];
$config->message->available['mail']['mr'] = $config->message->objectTypes['mr'];
$config->message->available['webhook'] = $config->message->objectTypes;
@@ -29,6 +31,7 @@ $config->message->available['message']['testtask'] = $config->message->objectTyp
$config->message->available['message']['todo'] = $config->message->objectTypes['todo'];
$config->message->available['message']['doc'] = $config->message->objectTypes['doc'];
$config->message->available['message']['release'] = $config->message->objectTypes['release'];
$config->message->available['message']['mr'] = $config->message->objectTypes['mr'];
$config->message->typeLink = array();
$config->message->typeLink['mail'] = 'mail|index';

27
module/message/lang/en.php
View File

@@ -17,3 +17,30 @@ $lang->message->browserSetting->pollTimePlaceholder = 'Notify the time intervals
$lang->message->browserSetting->turnonList[1] = 'On';
$lang->message->browserSetting->turnonList[0] = 'Off';
$lang->message->label = new stdclass();
$lang->message->label->created = 'create';
$lang->message->label->opened = 'open';
$lang->message->label->changed = 'change';
$lang->message->label->edited = 'edit';
$lang->message->label->assigned = 'assign';
$lang->message->label->closed = 'close';
$lang->message->label->deleted = 'delete';
$lang->message->label->undeleted = 'restore';
$lang->message->label->commented = 'comment';
$lang->message->label->activated = 'activate';
$lang->message->label->resolved = 'resolve';
$lang->message->label->reviewed = 'review';
$lang->message->label->confirmed = 'confirm Story';
$lang->message->label->frombug = 'convert from Bug';
$lang->message->label->started = 'start';
$lang->message->label->delayed = 'delay';
$lang->message->label->suspended = 'suspend';
$lang->message->label->finished = 'finish';
$lang->message->label->paused = 'pause';
$lang->message->label->canceled = 'cancel';
$lang->message->label->restarted = 'continue';
$lang->message->label->blocked = 'block';
$lang->message->label->bugconfirmed = 'confirm';
$lang->message->label->compilepass = 'compile pass';
$lang->message->label->compilefail = 'compile fail';

27
module/message/lang/zh-cn.php
View File

@@ -17,3 +17,30 @@ $lang->message->browserSetting->pollTimePlaceholder = '通知的时间间隔，
$lang->message->browserSetting->turnonList[1] = '打开';
$lang->message->browserSetting->turnonList[0] = '关闭';
$lang->message->label = new stdclass();
$lang->message->label->created = '创建';
$lang->message->label->opened = '创建';
$lang->message->label->changed = '变更';
$lang->message->label->edited = '编辑';
$lang->message->label->assigned = '指派';
$lang->message->label->closed = '关闭';
$lang->message->label->deleted = '删除';
$lang->message->label->undeleted = '还原';
$lang->message->label->commented = '评论';
$lang->message->label->activated = '激活';
$lang->message->label->resolved = '解决';
$lang->message->label->reviewed = '评审';
$lang->message->label->confirmed = "确认{$lang->SRCommon}";
$lang->message->label->frombug = "转{$lang->SRCommon}";
$lang->message->label->started = '开始';
$lang->message->label->delayed = '延期';
$lang->message->label->suspended = '挂起';
$lang->message->label->finished = '完成';
$lang->message->label->paused = '暂停';
$lang->message->label->canceled = '取消';
$lang->message->label->restarted = '继续';
$lang->message->label->blocked = '阻塞';
$lang->message->label->bugconfirmed = '确认';
$lang->message->label->compilepass = '构建通过';
$lang->message->label->compilefail = '构建失败';

1
module/message/model.php
View File

@@ -163,6 +163,7 @@ class messageModel extends model
if(empty($toList) and $objectType == 'todo') $toList = $object->account;
if(empty($toList) and $objectType == 'testtask') $toList = $object->owner;
if(empty($toList) and $objectType == 'meeting') $toList = $object->host . $object->participant;
if(empty($toList) and $objectType == 'mr') $toList = $object->createdBy . ',' . $object->assignee;
if(empty($toList) and $objectType == 'release')
{
/* Get notifiy persons. */