From 7c3bbe77dbb73e91cd8bfb9f9472528e86c41943 Mon Sep 17 00:00:00 2001 From: liyang Date: Fri, 17 Jan 2025 15:54:09 +0800 Subject: [PATCH] + [bug#59328] fix bug for build history in story view page. --- module/action/tao.php | 5 ++++- module/common/lang/menu.php | 1 - module/story/lang/zh-cn.php | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/module/action/tao.php b/module/action/tao.php index 3ccbf39608..11cb238dbc 100644 --- a/module/action/tao.php +++ b/module/action/tao.php @@ -409,8 +409,11 @@ class actionTao extends actionModel } elseif(in_array($type, array('build', 'bug', 'release', 'testtask', 'roadmap'))) { + $buildTab = $this->app->tab == 'product' ? 'project' : $this->app->tab; + if($this->app->tab == 'system') $buildTab = 'project'; + $object = $this->fetchObjectInfoByID($table, (int)$action->extra, 'name'); - if($object && $object->name) $action->extra = common::hasPriv($type, $method) ? html::a(helper::createLink($type, $method, $this->processParamString($action, $type)), $object->name) : $object->name; + if($object && $object->name) $action->extra = common::hasPriv($type, $method) ? html::a(helper::createLink($type, $method, $this->processParamString($action, $type)), $object->name, '', $type == 'build' ? "data-app='{$buildTab}'" : '') : $object->name; } elseif($type == 'revision') { diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index 7bfd876673..8d2217cec7 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -676,7 +676,6 @@ $lang->navGroup->auditplan = 'project'; $lang->navGroup->cm = 'project'; $lang->navGroup->nc = 'project'; $lang->navGroup->projectrelease = 'project'; -$lang->navGroup->build = 'project'; $lang->navGroup->milestone = 'project'; $lang->navGroup->researchplan = 'project'; $lang->navGroup->workestimation = 'project'; diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index ccfe53b3ef..e8646a720f 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -321,7 +321,7 @@ $lang->story->legendProjectAndTask = $lang->executionCommon . '任务'; $lang->story->legendBugs = '相关Bug'; $lang->story->legendFromBug = '来源Bug'; $lang->story->legendCases = '相关用例'; -$lang->story->legendBuilds = '相关版本'; +$lang->story->legendBuilds = '相关构建'; $lang->story->legendReleases = '相关发布'; $lang->story->legendLinkStories = "相关{$lang->SRCommon}"; $lang->story->legendChildStories = "拆分{$lang->SRCommon}"; @@ -408,8 +408,8 @@ $lang->story->action->unlinkedfromexecution = array('main' => '$date, 由 story->action->linked2kanban = array('main' => '$date, 由 $actor 关联到看板 $extra。'); $lang->story->action->linked2project = array('main' => '$date, 由 $actor ' . "关联到{$lang->projectCommon}" . ' $extra。'); $lang->story->action->unlinkedfromproject = array('main' => '$date, 由 $actor ' . "从{$lang->projectCommon}" . '$extra 移除。'); -$lang->story->action->linked2build = array('main' => '$date, 由 $actor 关联到版本 $extra。'); -$lang->story->action->unlinkedfrombuild = array('main' => '$date, 由 $actor 从版本 $extra 移除。'); +$lang->story->action->linked2build = array('main' => '$date, 由 $actor 关联到构建 $extra。'); +$lang->story->action->unlinkedfrombuild = array('main' => '$date, 由 $actor 从构建 $extra 移除。'); $lang->story->action->linked2release = array('main' => '$date, 由 $actor 关联到发布 $extra。'); $lang->story->action->unlinkedfromrelease = array('main' => '$date, 由 $actor 从发布 $extra 移除。'); $lang->story->action->linked2revision = array('main' => '$date, 由 $actor 关联到代码提交 $extra');