From e571c8a1da231ecf2347d73e45793bcac63667e9 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Wed, 9 Dec 2020 10:40:11 +0800 Subject: [PATCH 1/9] * Fix bug. --- module/doc/control.php | 2 +- module/doc/model.php | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/module/doc/control.php b/module/doc/control.php index 745df6a152..b7f4aa2e79 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -772,7 +772,7 @@ class doc extends control } elseif($this->from == 'project') { - $this->lang->navGroup->doc = 'program'; + $this->lang->navGroup->doc = 'project'; $this->lang->doc->menu = $this->lang->project->menu; $this->lang->doc->menuOrder = $this->lang->project->menuOrder; $this->project->setMenu($this->project->getExecutionsByProject($this->session->PRJ, 'all', 0, true), $objectID); diff --git a/module/doc/model.php b/module/doc/model.php index 34389a3277..3361670b20 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -1199,6 +1199,7 @@ class docModel extends model { if($type != 'product' and $type != 'project') return false; $objectLibs = $this->dao->select('*')->from(TABLE_DOCLIB)->where('deleted')->eq(0)->andWhere($type)->eq($objectID)->orderBy('`order`, id')->fetchAll('id'); + if($type == 'product') { $hasProject = $this->dao->select('DISTINCT t1.product, count(t1.project) as projectCount')->from(TABLE_PROJECTPRODUCT)->alias('t1') @@ -1219,6 +1220,13 @@ class docModel extends model $itemCounts = $this->statLibCounts(array_keys($libs)); foreach($libs as $libID => $lib) $libs[$libID]->allCount = $itemCounts[$libID]; + if(common::hasPriv('doc', 'showFiles')) + { + $libs['files'] = new stdclass(); + $libs['files']->name = $this->lang->doclib->files; + $libs['files']->allCount = count($this->getLibFiles($type, $objectID, 'id_desc')); + } + return $libs; } From e11004f2c53f36afa37b018a77bc916a13881643 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Wed, 9 Dec 2020 11:14:42 +0800 Subject: [PATCH 2/9] * Fix bug. --- module/product/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/product/control.php b/module/product/control.php index 293c9c5dfd..a12dd2a99b 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -689,7 +689,7 @@ class product extends control */ public function ajaxGetDropMenu($productID, $module, $method, $extra) { - $inProduct = zget($this->lang->navGroup, $this->app->rawModule) == 'product'; + $inProduct = zget($this->lang->navGroup, $module) == 'product'; $products = $inProduct ? $this->product->getList() : $this->product->getProductsByProject($this->session->PRJ); $this->view->link = $this->product->getProductLink($module, $method, $extra); From 56e0fc621f0b78343eb84947e72d19d465a34005 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Wed, 9 Dec 2020 11:28:54 +0800 Subject: [PATCH 3/9] * Fix bug. --- module/budget/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/budget/model.php b/module/budget/model.php index ad00c3fdc8..858d2ce026 100644 --- a/module/budget/model.php +++ b/module/budget/model.php @@ -162,7 +162,7 @@ class budgetModel extends model /* Count the costs incurred by a stage corresponding to a subject. */ foreach($budgets as $budget) { - $summary['stages'][$budget->stage][$budget->subject] = $budget->amount; + $summary['stages'][$budget->stage][$budget->subject] += $budget->amount; $summary['subjects'][$budget->subject] += $budget->amount; } From d56406cbf2bb69ff9a28f850253299e00c14d196 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 9 Dec 2020 11:29:59 +0800 Subject: [PATCH 4/9] * finish for task #8579. --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index b53a1c6e0d..c7bc6e9d02 100644 --- a/Makefile +++ b/Makefile @@ -140,13 +140,13 @@ package: rm -rf zentaopms/tools pms: make common - make zentaoxx - unzip zentaoxx.*.zip - cp zentaoxx/* zentaopms/ -r - cat zentaoxx/db/xuanxuan.sql >> zentaopms/db/zentao.sql + #make zentaoxx + #unzip zentaoxx.*.zip + #cp zentaoxx/* zentaopms/ -r + #cat zentaoxx/db/xuanxuan.sql >> zentaopms/db/zentao.sql make package zip -rq -9 ZenTaoPMS.$(VERSION).zip zentaopms - rm -fr zentaopms zentaoxx zentaoxx.*.zip + rm -fr zentaopms #zentaoxx zentaoxx.*.zip deb: mkdir buildroot cp -r build/debian/DEBIAN buildroot From fdd19cd2a1deb34b60e62d0213f54d389cb59e41 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Wed, 9 Dec 2020 11:41:21 +0800 Subject: [PATCH 5/9] * Finish task #8580. --- module/my/css/profile.css | 2 +- module/user/lang/de.php | 17 ++++++++++++----- module/user/lang/en.php | 17 ++++++++++++----- module/user/lang/fr.php | 17 ++++++++++++----- module/user/lang/vi.php | 17 ++++++++++++----- module/user/lang/zh-cn.php | 17 ++++++++++++----- 6 files changed, 61 insertions(+), 26 deletions(-) diff --git a/module/my/css/profile.css b/module/my/css/profile.css index 12d01331a8..987f23908e 100644 --- a/module/my/css/profile.css +++ b/module/my/css/profile.css @@ -7,5 +7,5 @@ .divider{border-left:1px solid #e5e5e5;} .tiles{padding-top:15px;} -.tile{margin-bottom:30px; text-align:left !important; padding-left:60px;} +.tile{text-align:left !important; padding-left:60px;} .tile-title{color:#999; padding-bottom:5px !important;} diff --git a/module/user/lang/de.php b/module/user/lang/de.php index 93926ede1f..2a71d00fcc 100644 --- a/module/user/lang/de.php +++ b/module/user/lang/de.php @@ -144,11 +144,18 @@ $lang->user->passwordStrengthList[2] = "Stark"; $lang->user->statusList['active'] = 'Aktiviert'; $lang->user->statusList['delete'] = 'Gelöscht'; -$lang->user->personalData['createdTodos'] = 'Todos Created'; -$lang->user->personalData['createdStories'] = 'Stories Created'; -$lang->user->personalData['finishedTasks'] = 'Tasks Finished'; -$lang->user->personalData['resolvedBugs'] = 'Bugs Resolved'; -$lang->user->personalData['createdCases'] = 'Cases Created'; +$lang->user->personalData['createdTodos'] = 'Todos Created'; +$lang->user->personalData['createdRequirements'] = "Requirements Created"; +$lang->user->personalData['createdStories'] = "Stories Created"; +$lang->user->personalData['finishedTasks'] = 'Tasks Finished'; +$lang->user->personalData['createdBugs'] = 'Bugs Created'; +$lang->user->personalData['resolvedBugs'] = 'Bugs Resolved'; +$lang->user->personalData['createdCases'] = 'Cases Created'; +$lang->user->personalData['createdRisks'] = 'Risks Created'; +$lang->user->personalData['resolvedRisks'] = 'Risks Resolved'; +$lang->user->personalData['createdIssues'] = 'Issues Created'; +$lang->user->personalData['resolvedIssues'] = 'Issues Resolved'; +$lang->user->personalData['createdDocs'] = 'Docs Created'; $lang->user->keepLogin['on'] = 'Angemeldet bleiben'; $lang->user->loginWithDemoUser = 'Login als Demo User:'; diff --git a/module/user/lang/en.php b/module/user/lang/en.php index 026e72efc9..0e75e975d1 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -144,11 +144,18 @@ $lang->user->passwordStrengthList[2] = "Strong" $lang->user->statusList['active'] = 'Active'; $lang->user->statusList['delete'] = 'Deleted'; -$lang->user->personalData['createdTodos'] = 'Todos Created'; -$lang->user->personalData['createdStories'] = 'Stories Created'; -$lang->user->personalData['finishedTasks'] = 'Tasks Finished'; -$lang->user->personalData['resolvedBugs'] = 'Bugs Resolved'; -$lang->user->personalData['createdCases'] = 'Cases Created'; +$lang->user->personalData['createdTodos'] = 'Todos Created'; +$lang->user->personalData['createdRequirements'] = "Requirements Created"; +$lang->user->personalData['createdStories'] = "Stories Created"; +$lang->user->personalData['finishedTasks'] = 'Tasks Finished'; +$lang->user->personalData['createdBugs'] = 'Bugs Created'; +$lang->user->personalData['resolvedBugs'] = 'Bugs Resolved'; +$lang->user->personalData['createdCases'] = 'Cases Created'; +$lang->user->personalData['createdRisks'] = 'Risks Created'; +$lang->user->personalData['resolvedRisks'] = 'Risks Resolved'; +$lang->user->personalData['createdIssues'] = 'Issues Created'; +$lang->user->personalData['resolvedIssues'] = 'Issues Resolved'; +$lang->user->personalData['createdDocs'] = 'Docs Created'; $lang->user->keepLogin['on'] = 'Keep Login'; $lang->user->loginWithDemoUser = 'Login as Demo User:'; diff --git a/module/user/lang/fr.php b/module/user/lang/fr.php index 0be8e541e9..c2cc1e95aa 100644 --- a/module/user/lang/fr.php +++ b/module/user/lang/fr.php @@ -144,11 +144,18 @@ $lang->user->passwordStrengthList[2] = "Fort"; $lang->user->statusList['active'] = 'Actif'; $lang->user->statusList['delete'] = 'Supprimé'; -$lang->user->personalData['createdTodos'] = 'Entrées Agenda Créées'; -$lang->user->personalData['createdStories'] = 'Stories Créées'; -$lang->user->personalData['finishedTasks'] = 'Tâches Terminées'; -$lang->user->personalData['resolvedBugs'] = 'Bugs Résolus'; -$lang->user->personalData['createdCases'] = 'CasTests Créés'; +$lang->user->personalData['createdTodos'] = 'Todos Created'; +$lang->user->personalData['createdRequirements'] = "Requirements Created"; +$lang->user->personalData['createdStories'] = "Stories Created"; +$lang->user->personalData['finishedTasks'] = 'Tasks Finished'; +$lang->user->personalData['createdBugs'] = 'Bugs Created'; +$lang->user->personalData['resolvedBugs'] = 'Bugs Resolved'; +$lang->user->personalData['createdCases'] = 'Cases Created'; +$lang->user->personalData['createdRisks'] = 'Risks Created'; +$lang->user->personalData['resolvedRisks'] = 'Risks Resolved'; +$lang->user->personalData['createdIssues'] = 'Issues Created'; +$lang->user->personalData['resolvedIssues'] = 'Issues Resolved'; +$lang->user->personalData['createdDocs'] = 'Docs Created'; $lang->user->keepLogin['on'] = 'Rester connecté'; $lang->user->loginWithDemoUser = "Se connecté en tant qu'invité :"; diff --git a/module/user/lang/vi.php b/module/user/lang/vi.php index a80ec1a6d5..f41edf50d9 100644 --- a/module/user/lang/vi.php +++ b/module/user/lang/vi.php @@ -144,11 +144,18 @@ $lang->user->passwordStrengthList[2] = "Mạnh" $lang->user->statusList['active'] = 'Kích hoạt'; $lang->user->statusList['delete'] = 'Đã xóa'; -$lang->user->personalData['createdTodos'] = 'Việc đã tạo'; -$lang->user->personalData['createdStories'] = 'Chuyện đã tạo'; -$lang->user->personalData['finishedTasks'] = 'Nhiệm vụ đã kết thúc'; -$lang->user->personalData['resolvedBugs'] = 'Bugs đã giải quyết'; -$lang->user->personalData['createdCases'] = 'Tình huống đã tạo'; +$lang->user->personalData['createdTodos'] = 'Todos Created'; +$lang->user->personalData['createdRequirements'] = "Requirements Created"; +$lang->user->personalData['createdStories'] = "Stories Created"; +$lang->user->personalData['finishedTasks'] = 'Tasks Finished'; +$lang->user->personalData['createdBugs'] = 'Bugs Created'; +$lang->user->personalData['resolvedBugs'] = 'Bugs Resolved'; +$lang->user->personalData['createdCases'] = 'Cases Created'; +$lang->user->personalData['createdRisks'] = 'Risks Created'; +$lang->user->personalData['resolvedRisks'] = 'Risks Resolved'; +$lang->user->personalData['createdIssues'] = 'Issues Created'; +$lang->user->personalData['resolvedIssues'] = 'Issues Resolved'; +$lang->user->personalData['createdDocs'] = 'Docs Created'; $lang->user->keepLogin['on'] = 'Duy trì đăng nhập'; $lang->user->loginWithDemoUser = 'Đăng nhập Demo:'; diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php index ac32efa643..a420ac6498 100644 --- a/module/user/lang/zh-cn.php +++ b/module/user/lang/zh-cn.php @@ -144,11 +144,18 @@ $lang->user->passwordStrengthList[2] = "强"; $lang->user->statusList['active'] = '正常'; $lang->user->statusList['delete'] = '删除'; -$lang->user->personalData['createdTodos'] = '创建的待办数'; -$lang->user->personalData['createdStories'] = "创建的{$lang->productSRCommon}数"; -$lang->user->personalData['finishedTasks'] = '完成的任务数'; -$lang->user->personalData['resolvedBugs'] = '解决的Bug数'; -$lang->user->personalData['createdCases'] = '创建的用例数'; +$lang->user->personalData['createdTodos'] = '创建的待办数'; +$lang->user->personalData['createdRequirements'] = "创建的{$lang->URCommon}数"; +$lang->user->personalData['createdStories'] = "创建的{$lang->SRCommon}数"; +$lang->user->personalData['finishedTasks'] = '完成的任务数'; +$lang->user->personalData['createdBugs'] = '提交的Bug数'; +$lang->user->personalData['resolvedBugs'] = '解决的Bug数'; +$lang->user->personalData['createdCases'] = '创建的用例数'; +$lang->user->personalData['createdRisks'] = '创建的风险数'; +$lang->user->personalData['resolvedRisks'] = '解决的风险数'; +$lang->user->personalData['createdIssues'] = '创建的问题数'; +$lang->user->personalData['resolvedIssues'] = '解决的问题数'; +$lang->user->personalData['createdDocs'] = '创建的文档数'; $lang->user->keepLogin['on'] = '保持登录'; $lang->user->loginWithDemoUser = '使用demo帐号登录：'; From 2fa5e703b8b8df81307797d0252416a43273446a Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Wed, 9 Dec 2020 10:42:18 +0800 Subject: [PATCH 6/9] * Finish task#8591. --- module/story/config.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/story/config.php b/module/story/config.php index bf40278686..fceedf5436 100644 --- a/module/story/config.php +++ b/module/story/config.php @@ -62,7 +62,7 @@ $config->story->datatable->fieldList['pri']['required'] = 'no'; $config->story->datatable->fieldList['title']['title'] = 'title'; $config->story->datatable->fieldList['title']['fixed'] = 'left'; -$config->story->datatable->fieldList['title']['width'] = 'auto'; +$config->story->datatable->fieldList['title']['width'] = '170'; $config->story->datatable->fieldList['title']['required'] = 'yes'; $config->story->datatable->fieldList['branch']['title'] = 'branch'; @@ -97,7 +97,7 @@ $config->story->datatable->fieldList['status']['required'] = 'no'; $config->story->datatable->fieldList['estimate']['title'] = 'estimateAB'; $config->story->datatable->fieldList['estimate']['fixed'] = 'no'; -$config->story->datatable->fieldList['estimate']['width'] = '65'; +$config->story->datatable->fieldList['estimate']['width'] = '60'; $config->story->datatable->fieldList['estimate']['required'] = 'no'; $config->story->datatable->fieldList['stage']['title'] = 'stageAB'; From f11c8319f7854852f28b34915057530d045f4f77 Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Wed, 9 Dec 2020 12:53:26 +0800 Subject: [PATCH 7/9] * Finish task#8576. --- module/block/control.php | 12 +++++++++++- module/block/view/productblock.html.php | 7 +++++++ module/product/lang/de.php | 1 + module/product/lang/en.php | 1 + module/product/lang/fr.php | 1 + module/product/lang/vi.php | 1 + module/product/lang/zh-cn.php | 1 + module/product/lang/zh-tw.php | 1 + 8 files changed, 24 insertions(+), 1 deletion(-) diff --git a/module/block/control.php b/module/block/control.php index 015398f326..ca3e646c7c 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -784,7 +784,17 @@ class block extends control $type = isset($this->params->type) ? $this->params->type : ''; $pager = pager::init(0, $count , 1); - $productStats = $this->loadModel('product')->getStats('order_desc', $pager, $type); + $productStats = $this->loadModel('product')->getStats('order_desc', $this->viewType != 'json' ? $pager : '', $type); + $productIdList = array(); + foreach($productStats as $product) $productIdList[] = $product->id; + + $this->view->executions = $this->dao->select('t1.product,t2.name')->from(TABLE_PROJECTPRODUCT)->alias('t1') + ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id') + ->where('t1.product')->in($productIdList) + ->andWhere('t2.type')->in('stage,sprint') + ->andWhere('t2.deleted')->eq(0) + ->orderBy('t1.project') + ->fetchPairs('product', 'name'); $this->view->productStats = $productStats; } diff --git a/module/block/view/productblock.html.php b/module/block/view/productblock.html.php index 85a348b0d6..1e447f6469 100644 --- a/module/block/view/productblock.html.php +++ b/module/block/view/productblock.html.php @@ -21,6 +21,9 @@ product->name;?> + + product->currentExecution;?> + product->plans;?> product->releases;?> product->activeStories;?> @@ -35,6 +38,10 @@ ?> > name?> + + id, '');?> + + plans?> releases?> stories['active']?> diff --git a/module/product/lang/de.php b/module/product/lang/de.php index 64aca7bbe8..3ae9a88e14 100644 --- a/module/product/lang/de.php +++ b/module/product/lang/de.php @@ -47,6 +47,7 @@ $lang->product->project = $lang->projectCommon . 'Liste'; $lang->product->build = 'Build'; $lang->product->projectInfo = "{$lang->projectCommon}s that are linked to this {$lang->productCommon} are listed below."; +$lang->product->currentExecution = 'Aktuelle Iteration/Phase'; $lang->product->activeStories = 'Aktivierte [S]'; $lang->product->activeStoriesTitle = 'Active Stories'; $lang->product->changedStories = 'Geänderte [S]'; diff --git a/module/product/lang/en.php b/module/product/lang/en.php index 170facba81..9997b7914e 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -47,6 +47,7 @@ $lang->product->project = $lang->projectCommon . ' List'; $lang->product->build = 'Build List'; $lang->product->projectInfo = "{$lang->projectCommon}s that are linked to this {$lang->productCommon} are listed below."; +$lang->product->currentExecution = 'Current iteration/phase'; $lang->product->activeStories = 'Active [S]'; $lang->product->activeStoriesTitle = 'Active Stories'; $lang->product->changedStories = 'Changed [S]'; diff --git a/module/product/lang/fr.php b/module/product/lang/fr.php index 28b9f79586..0877903ff9 100644 --- a/module/product/lang/fr.php +++ b/module/product/lang/fr.php @@ -47,6 +47,7 @@ $lang->product->project = ' Liste ' . $lang->projectCommon; $lang->product->build = 'Liste Builds'; $lang->product->projectInfo = "Les {$lang->projectCommon}s qui sont associés à ce {$lang->productCommon} sont listés ci-dessous."; +$lang->product->currentExecution = 'Current iteration/phase'; $lang->product->activeStories = 'Actives [S]'; $lang->product->activeStoriesTitle = 'Stories Actives'; $lang->product->changedStories = 'Changées [S]'; diff --git a/module/product/lang/vi.php b/module/product/lang/vi.php index 6bc26400a9..7a5903874a 100644 --- a/module/product/lang/vi.php +++ b/module/product/lang/vi.php @@ -47,6 +47,7 @@ $lang->product->project = 'Danh sách '.$lang->projectCommon; $lang->product->build = 'Danh sách bản dựng'; $lang->product->projectInfo = "{$lang->projectCommon} đã liên kết tới {$lang->productCommon} này được liệt kê bên dưới."; +$lang->product->currentExecution = 'Chế độ lặp hiện thời'; $lang->product->activeStories = 'Kích hoạt [S]'; $lang->product->activeStoriesTitle = 'Kích hoạt câu chuyện'; $lang->product->changedStories = 'Đã thay đổi [S]'; diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index b16f6384f2..306a152c66 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -47,6 +47,7 @@ $lang->product->project = $lang->projectCommon . '列表'; $lang->product->build = '版本列表'; $lang->product->projectInfo = "所有与此产品关联的{$lang->projectCommon}"; +$lang->product->currentExecution = '当前迭代/阶段'; $lang->product->activeStories = "激活{$lang->productSRCommon}"; $lang->product->activeStoriesTitle = "激活{$lang->productSRCommon}"; $lang->product->changedStories = "已变更{$lang->productSRCommon}"; diff --git a/module/product/lang/zh-tw.php b/module/product/lang/zh-tw.php index 326a9d3caf..30b6a568ca 100644 --- a/module/product/lang/zh-tw.php +++ b/module/product/lang/zh-tw.php @@ -47,6 +47,7 @@ $lang->product->project = $lang->projectCommon . '列表'; $lang->product->build = '版本列表'; $lang->product->projectInfo = "所有與此產品關聯的{$lang->projectCommon}"; +$lang->product->currentExecution = '當前迭代/階段'; $lang->product->activeStories = "激活{$lang->productSRCommon}"; $lang->product->activeStoriesTitle = "激活{$lang->productSRCommon}"; $lang->product->changedStories = "已變更{$lang->productSRCommon}"; From 6cd56309e2a3d554278c7316906cdebd45f1224b Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Wed, 9 Dec 2020 13:18:46 +0800 Subject: [PATCH 8/9] * Finish task #8585. --- module/design/control.php | 1 + module/user/lang/zh-cn.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/module/design/control.php b/module/design/control.php index c6b8868cd6..c85a751cda 100644 --- a/module/design/control.php +++ b/module/design/control.php @@ -141,6 +141,7 @@ class design extends control $this->send($response); } + $this->design->setProductMenu($productID); $this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->batchCreate; $this->view->position[] = $this->lang->design->batchCreate; diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php index a420ac6498..02d76157e4 100644 --- a/module/user/lang/zh-cn.php +++ b/module/user/lang/zh-cn.php @@ -145,8 +145,8 @@ $lang->user->statusList['active'] = '正常'; $lang->user->statusList['delete'] = '删除'; $lang->user->personalData['createdTodos'] = '创建的待办数'; -$lang->user->personalData['createdRequirements'] = "创建的{$lang->URCommon}数"; -$lang->user->personalData['createdStories'] = "创建的{$lang->SRCommon}数"; +$lang->user->personalData['createdRequirements'] = "创建的用需/史诗数"; +$lang->user->personalData['createdStories'] = "创建的软需/故事数"; $lang->user->personalData['finishedTasks'] = '完成的任务数'; $lang->user->personalData['createdBugs'] = '提交的Bug数'; $lang->user->personalData['resolvedBugs'] = '解决的Bug数'; From f753d03fc52661038d1d1f9646352c1e730a4239 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Wed, 9 Dec 2020 13:22:07 +0800 Subject: [PATCH 9/9] * Finish task #8588. --- module/program/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/program/model.php b/module/program/model.php index d66d556935..5482fbb1a1 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -363,7 +363,7 @@ class programModel extends model while($program = $stmt->fetch()) { - $link = $from == 'program' ? helper::createLink('program', 'pgmview', "programID=$program->id") : helper::createLink('product', 'all', "programID=$program->id" . $vars); + $link = $from == 'program' ? helper::createLink('program', 'pgmproject', "programID=$program->id") : helper::createLink('product', 'all', "programID=$program->id" . $vars); $linkHtml = html::a($link, " " . $program->name, '', "id='program$program->id' class='text-ellipsis' title=$program->name"); if(isset($programMenu[$program->id]) and !empty($programMenu[$program->id]))