diff --git a/module/action/lang/en.php b/module/action/lang/en.php index a080f89426..1a35c0fc70 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -86,6 +86,7 @@ $lang->action->periods['lastmonth'] = $lang->action->dynamic->lastMonth; $lang->action->objectTypes['product'] = $lang->productCommon; $lang->action->objectTypes['branch'] = 'Branch'; $lang->action->objectTypes['story'] = $lang->SRCommon; +$lang->action->objectTypes['requirement'] = $lang->URCommon; $lang->action->objectTypes['design'] = 'Design'; $lang->action->objectTypes['productplan'] = 'Plan'; $lang->action->objectTypes['release'] = 'Release'; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index 5867b2d16a..fb8748b5dd 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -86,6 +86,7 @@ $lang->action->periods['lastmonth'] = $lang->action->dynamic->lastMonth; $lang->action->objectTypes['product'] = $lang->productCommon; $lang->action->objectTypes['branch'] = '分支'; $lang->action->objectTypes['story'] = $lang->SRCommon; +$lang->action->objectTypes['requirement'] = $lang->URCommon; $lang->action->objectTypes['design'] = '设计'; $lang->action->objectTypes['productplan'] = '计划'; $lang->action->objectTypes['release'] = '发布'; diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php index 675e78c19d..6be07b8f96 100755 --- a/module/action/lang/zh-tw.php +++ b/module/action/lang/zh-tw.php @@ -84,6 +84,7 @@ $lang->action->periods['lastmonth'] = $lang->action->dynamic->lastMonth; $lang->action->objectTypes['product'] = $lang->productCommon; $lang->action->objectTypes['branch'] = '分支'; $lang->action->objectTypes['story'] = $lang->SRCommon; +$lang->action->objectTypes['requirement'] = $lang->URCommon; $lang->action->objectTypes['design'] = '設計'; $lang->action->objectTypes['productplan'] = '計劃'; $lang->action->objectTypes['release'] = '發佈'; diff --git a/module/webhook/model.php b/module/webhook/model.php index e8638e0df5..c518eacce2 100644 --- a/module/webhook/model.php +++ b/module/webhook/model.php @@ -414,12 +414,13 @@ class webhookModel extends model static $users = array(); if(empty($users)) $users = $this->loadModel('user')->getList(); - $object = $this->dao->select('*')->from($this->config->objectTables[$objectType])->where('id')->eq($objectID)->fetch(); - $field = $this->config->action->objectNameFields[$objectType]; - $host = empty($webhook->domain) ? common::getSysURL() : $webhook->domain; - $viewLink = $this->getViewLink($objectType, $objectID); - $title = $this->app->user->realname . $this->lang->action->label->$actionType . $this->lang->action->objectTypes[$objectType]; - $text = $title . ' ' . "[#{$objectID}::{$object->$field}](" . $host . $viewLink . ")"; + $object = $this->dao->select('*')->from($this->config->objectTables[$objectType])->where('id')->eq($objectID)->fetch(); + $field = $this->config->action->objectNameFields[$objectType]; + $host = empty($webhook->domain) ? common::getSysURL() : $webhook->domain; + $viewLink = $this->getViewLink($objectType, $objectID); + $objectTypeName = ($objectType == 'story' and $object->type == 'requirement') ? $this->lang->action->objectTypes['requirement'] : $this->lang->action->objectTypes[$objectType]; + $title = $this->app->user->realname . $this->lang->action->label->$actionType . $objectTypeName; + $text = $title . ' ' . "[#{$objectID}::{$object->$field}](" . $host . $viewLink . ")"; $mobile = ''; $email = '';