From e9f561b477a117e718a51ae316b484542bd15d53 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Fri, 26 Mar 2021 17:33:30 +0800 Subject: [PATCH] * Fix code details. --- module/doc/control.php | 2 +- module/execution/lang/de.php | 1 - module/execution/lang/en.php | 1 - module/execution/lang/fr.php | 3 +-- module/execution/lang/vi.php | 3 +-- module/execution/lang/zh-cn.php | 3 +-- module/product/model.php | 1 + module/program/model.php | 4 ++-- module/story/control.php | 1 - 9 files changed, 7 insertions(+), 12 deletions(-) diff --git a/module/doc/control.php b/module/doc/control.php index a1e74b3c7c..3d4ce9ba2e 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -799,7 +799,7 @@ class doc extends control if($type == 'execution') { $executionID = $objectID; - if(!$this->executionID->checkPriv($objectID)) $this->accessDenied(); + if(!$this->execution->checkPriv($objectID)) $this->accessDenied(); } } diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php index e5fd2bf703..071139edc1 100644 --- a/module/execution/lang/de.php +++ b/module/execution/lang/de.php @@ -261,7 +261,6 @@ $lang->execution->aboveAllExecution = "Alle oberen {$lang->executionCommon}"; /* 页面提示。*/ $lang->execution->linkStoryByPlanTips = "This action will link all stories in this plan to the {$lang->executionCommon}."; $lang->execution->selectExecution = "Auswahl {$lang->executionCommon}"; -$lang->execution->selectExecution = "Select Execution"; $lang->execution->beginAndEnd = 'Dauer'; $lang->execution->lblStats = 'Mannstunden Summe(h) : '; $lang->execution->stats = '%s Verfügbar, %s geplant, %s genutzt, %s Rest.'; diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php index 356c54b825..d3e378bf0a 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -261,7 +261,6 @@ $lang->execution->aboveAllExecution = "All the above {$lang->executionCommon}s"; /* Page prompt. */ $lang->execution->linkStoryByPlanTips = "This action will link all stories in this plan to the {$lang->executionCommon}."; $lang->execution->selectExecution = "Select {$lang->executionCommon}"; -$lang->execution->selectExecution = "Select Stage/Sprint/Iteration"; $lang->execution->beginAndEnd = 'Duration'; $lang->execution->lblStats = 'Efforts'; $lang->execution->stats = 'Available: %s(h). Estimates: %s(h). Cost: %s(h). Left: %s(h).'; diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php index 689b733a3e..ff6bf241f4 100644 --- a/module/execution/lang/fr.php +++ b/module/execution/lang/fr.php @@ -260,8 +260,7 @@ $lang->execution->aboveAllExecution = "Tous les {$lang->executionCommon}s dépen /* 页面提示。*/ $lang->execution->linkStoryByPlanTips = "Cette action va lier toutes les stories incluses dans le plan à ce {$lang->executionCommon}."; -$lang->execution->selectExecution = "Sélectionner {$lang->executionCommon}"; -$lang->execution->selectExecution = "Select Execution"; +$lang->execution->selectExecution = "Sélectionner {$lang->executionCommon}"; $lang->execution->beginAndEnd = 'Durée'; $lang->execution->lblStats = 'Efforts'; $lang->execution->stats = 'Disponible: %s(h). Estimé: %s(h). Coût: %s(h). Reste: %s(h).'; diff --git a/module/execution/lang/vi.php b/module/execution/lang/vi.php index 702efe4ccd..53bc22f0cf 100644 --- a/module/execution/lang/vi.php +++ b/module/execution/lang/vi.php @@ -260,8 +260,7 @@ $lang->execution->aboveAllExecution = "Tất cả {$lang->executionCommon} trên /* Page prompt. */ $lang->execution->linkStoryByPlanTips = "Hành động này sẽ liên kết tất cả câu chuyện trong kế hoạch này tới {$lang->executionCommon} này."; -$lang->execution->selectExecution = "Chọn {$lang->executionCommon}"; -$lang->execution->selectExecution = "Select Execution"; +$lang->execution->selectExecution = "Chọn {$lang->executionCommon}"; $lang->execution->beginAndEnd = 'Thời gian'; $lang->execution->lblStats = 'Chấm công'; $lang->execution->stats = 'Khả dụng: %s(giờ). Dự tính: %s(giờ). Đã làm: %s(giờ). Còn: %s(giờ).'; diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php index a298d13aef..bd0830d890 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -260,8 +260,7 @@ $lang->execution->aboveAllExecution = "以上所有{$lang->executionCommon}"; /* 页面提示。*/ $lang->execution->linkStoryByPlanTips = "此操作会将所选计划下面的{$lang->SRCommon}全部关联到此{$lang->executionCommon}中"; -$lang->execution->selectExecution = "请选择{$lang->executionCommon}"; -$lang->execution->selectExecution = "请选择阶段/迭代/冲刺"; +$lang->execution->selectExecution = "请选择执行"; $lang->execution->beginAndEnd = '起止时间'; $lang->execution->lblStats = '工时统计'; $lang->execution->stats = '可用工时 %s 工时，总共预计 %s 工时，已经消耗 %s 工时，预计剩余 %s 工时'; diff --git a/module/product/model.php b/module/product/model.php index 7662eb4efd..7ec4be92c5 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -437,6 +437,7 @@ class productModel extends model { $currentProduct = $this->getById($productID); $currentProductName = $currentProduct->name; + $this->session->set('currentProductType', $currentProduct->type); } $fromModule = $this->lang->navGroup->qa == 'qa' ? 'qa' : ''; diff --git a/module/program/model.php b/module/program/model.php index b5430776f2..f0f4d10f69 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -652,11 +652,11 @@ class programModel extends model * @access public * @return array */ - public function getParentPairs($model = '', $mode = '') + public function getParentPairs($model = '', $mode = 'noclosed') { $modules = $this->dao->select('id,name,parent,path,grade')->from(TABLE_PROGRAM) ->where('type')->eq('program') - ->beginIF(strpos($mode, 'noclosed') === false)->andWhere('status')->ne('closed')->fi() + ->beginIF(strpos($mode, 'noclosed') !== false)->andWhere('status')->ne('closed')->fi() ->andWhere('deleted')->eq(0) ->beginIF($model)->andWhere('model')->eq($model)->fi() ->orderBy('grade desc, `order`') diff --git a/module/story/control.php b/module/story/control.php index 3c17e8fcf4..19920621dc 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -1474,7 +1474,6 @@ class story extends control else { $this->app->rawModule = 'testcase'; - $this->loadModel('qa')->setMenu($productID); foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa'; }