From 2c4d89ed45dc199181368875d194b8902cdd991a Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Thu, 17 Dec 2020 08:56:09 +0800 Subject: [PATCH 1/4] * Adjust code. --- module/issue/control.php | 10 +++------- module/issue/view/storyform.html.php | 6 +++--- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/module/issue/control.php b/module/issue/control.php index 5ae7b93010..1bbd04bf50 100644 --- a/module/issue/control.php +++ b/module/issue/control.php @@ -401,13 +401,9 @@ class issue extends control case 'totask': $this->loadModel('story'); - $project = $this->project->getById($projectID); - $members = $this->project->getTeamMemberPairs($projectID, 'nodeleted'); - $stories = $this->story->getProjectStoryPairs($projectID, 0, 0); - - $this->view->project = $project; - $this->view->members = $members; - $this->view->stories = $stories; + $this->view->project = $this->project->getById($projectID); + $this->view->members = $this->project->getTeamMemberPairs($projectID, 'nodeleted'); + $this->view->stories = $this->story->getProjectStoryPairs($projectID, 0, 0); $this->view->showFields = $this->config->task->custom->createFields; $this->display('issue', 'taskform'); diff --git a/module/issue/view/storyform.html.php b/module/issue/view/storyform.html.php index 7017ea736b..ecf3a226fc 100644 --- a/module/issue/view/storyform.html.php +++ b/module/issue/view/storyform.html.php @@ -48,7 +48,7 @@
"; @@ -66,9 +66,9 @@
story->source;?>
- story->sourceList, $source, "class='form-control chosen'");?> + story->sourceList, 0, "class='form-control chosen'");?> story->sourceNote;?> - +
From f30d0a990ec332ef4d22f328716b16edeb414746 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Thu, 17 Dec 2020 09:04:05 +0800 Subject: [PATCH 2/4] * Finish task#8663. --- module/story/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/story/control.php b/module/story/control.php index 292144e269..7c1466c962 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -1334,8 +1334,8 @@ class story extends control /* Set menu. The projectstory module does not execute. */ if($this->app->rawModule == 'story') { - $products = $this->product->getPairs(); $this->lang->product->menu = $this->lang->product->viewMenu; + $products = $this->product->getPairs(); $productID = $this->product->saveState($productID, $products); $this->lang->product->switcherMenu = $this->product->getSwitcher($productID, '', $branch); $this->product->setMenu($products, $productID, $branch); From 47cebcb39b8812b67cae26359754af3e8599f710 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Thu, 17 Dec 2020 09:14:13 +0800 Subject: [PATCH 3/4] * Fix bug. --- module/action/lang/zh-cn.php | 7 ++++--- module/company/control.php | 23 ++++++++++++----------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index a76a0d17f7..783acf6d75 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -437,13 +437,14 @@ $lang->action->label->stakeholder = '干系人|stakeholder|view|userID=%s'; /* Object type. */ $lang->action->search->objectTypeList[''] = ''; $lang->action->search->objectTypeList['product'] = $lang->productCommon; -$lang->action->search->objectTypeList['program'] = '项目'; -$lang->action->search->objectTypeList['project'] = $lang->projectCommon; +$lang->action->search->objectTypeList['program'] = '项目集'; +$lang->action->search->objectTypeList['project'] = '项目'; +$lang->action->search->objectTypeList['execution'] = '迭代/阶段'; $lang->action->search->objectTypeList['bug'] = 'Bug'; $lang->action->search->objectTypeList['case'] = '用例'; $lang->action->search->objectTypeList['caseresult'] = '用例结果'; $lang->action->search->objectTypeList['stepresult'] = '用例步骤'; -$lang->action->search->objectTypeList['story'] = $lang->productSRCommon; +$lang->action->search->objectTypeList['story'] = '用需/软需'; $lang->action->search->objectTypeList['task'] = '任务'; $lang->action->search->objectTypeList['testtask'] = '测试单'; $lang->action->search->objectTypeList['user'] = '用户'; diff --git a/module/company/control.php b/module/company/control.php index d8936db068..cbeea77285 100644 --- a/module/company/control.php +++ b/module/company/control.php @@ -245,17 +245,18 @@ class company extends control $this->loadModel('search')->setSearchParams($this->config->company->dynamic->search); /* Assign. */ - $this->view->browseType = $browseType; - $this->view->account = $account; - $this->view->product = $product; - $this->view->project = $project; - $this->view->queryID = $queryID; - $this->view->orderBy = $orderBy; - $this->view->pager = $pager; - $this->view->user = $user; - $this->view->param = $param; - $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction, $browseType); - $this->view->direction = $direction; + $this->view->browseType = $browseType; + $this->view->account = $account; + $this->view->accountPairs = $this->user->getPairs('noclosed|nodeleted|noletter'); + $this->view->product = $product; + $this->view->project = $project; + $this->view->queryID = $queryID; + $this->view->orderBy = $orderBy; + $this->view->pager = $pager; + $this->view->user = $user; + $this->view->param = $param; + $this->view->dateGroups = $this->action->buildDateGroup($actions, $direction, $browseType); + $this->view->direction = $direction; $this->display(); } } From 9cc53ca106bb9c2405871efcfd24d6e5936fca2b Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Thu, 17 Dec 2020 09:09:56 +0800 Subject: [PATCH 4/4] * Fix bug. --- module/action/lang/zh-cn.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index 783acf6d75..c2b3c26392 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -90,8 +90,8 @@ $lang->action->objectTypes['todo'] = '待办'; $lang->action->objectTypes['risk'] = '风险'; $lang->action->objectTypes['issue'] = '问题'; $lang->action->objectTypes['module'] = '模块'; -$lang->action->objecttypes['user'] = '用户'; -$lang->action->objecttypes['stakeholder'] = '干系人'; +$lang->action->objectTypes['user'] = '用户'; +$lang->action->objectTypes['stakeholder'] = '干系人'; $lang->action->objectTypes['budget'] = '费用估算'; $lang->action->objectTypes['entry'] = '应用'; $lang->action->objectTypes['webhook'] = 'Webhook';