diff --git a/extension/ipd/common/ext/lang/zh-cn/ipd.php b/extension/ipd/common/ext/lang/zh-cn/ipd.php index fc5b367b83..30cd239b51 100644 --- a/extension/ipd/common/ext/lang/zh-cn/ipd.php +++ b/extension/ipd/common/ext/lang/zh-cn/ipd.php @@ -81,4 +81,4 @@ $lang->charter->menu->all = array('link' => "全部|charter|browse|browseTy $lang->charter->menu->wait = array('link' => "待立项|charter|browse|browseType=wait"); $lang->charter->menu->launched = array('link' => "已立项|charter|browse|browseType=launched"); $lang->charter->menu->failed = array('link' => "未通过|charter|browse|browseType=failed"); -$lang->charter->menu->settings = array('link' => "{$lang->settings}|charter|view|charterID=%s", 'subModule' => 'tree,branch', 'alias' => 'edit,whitelist,addwhitelist'); +//$lang->charter->menu->settings = array('link' => "{$lang->settings}|charter|view|charterID=%s", 'subModule' => 'tree,branch', 'alias' => 'edit,whitelist,addwhitelist'); diff --git a/module/action/model.php b/module/action/model.php index c517d136bf..6d6207b209 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -413,6 +413,11 @@ class actionModel extends model $title = $this->dao->select('title')->from(TABLE_PRODUCTPLAN)->where('id')->eq($action->extra)->fetch('title'); if($title) $action->extra = common::hasPriv('productplan', 'view') ? html::a(helper::createLink('productplan', 'view', "planID=$action->extra"), $title) : $title; } + elseif($actionName == 'changedbycharter' and $action->objectType == 'story') + { + $name = $this->dao->select('name')->from(TABLE_CHARTER)->where('id')->eq($action->extra)->fetch('name'); + if($name) $action->extra = common::hasPriv('charter', 'view') ? html::a(helper::createLink('charter', 'view', "charterID=$action->extra"), $name) : $name; + } elseif($actionName == 'linked2roadmap' and $action->objectType == 'story') { $name = $this->dao->select('name')->from(TABLE_ROADMAP)->where('id')->eq($action->extra)->fetch('name');