From 08c1428b30d535f635ff95b4714541f3db91f77f Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Tue, 15 Sep 2020 17:20:19 +0800 Subject: [PATCH] * Fix bug #7914. --- module/testcase/config.php | 2 +- module/testcase/control.php | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/module/testcase/config.php b/module/testcase/config.php index 6019046b7a..487f67fa13 100644 --- a/module/testcase/config.php +++ b/module/testcase/config.php @@ -21,7 +21,7 @@ $config->testcase->exportFields = ' id, product, branch, module, story, title, precondition, stepDesc, stepExpect, real, keywords, pri, type, stage, status, bugsAB, resultsAB, stepNumberAB, lastRunResult, openedBy, openedDate, - lastEditedBy, lastEditedDate, version, linkCase'; + lastEditedBy, lastEditedDate, version, linkCase, files'; $config->testcase->customCreateFields = 'story,stage,pri,keywords'; $config->testcase->customBatchCreateFields = 'module,stage,story,pri,precondition,keywords,review'; diff --git a/module/testcase/control.php b/module/testcase/control.php index 8f50618dee..fcf23a3401 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -1111,6 +1111,7 @@ class testcase extends control if($product->type != 'normal') $this->lang->testcase->branch = $this->lang->product->branchName[$product->type]; if($_POST) { + $this->loadModel('file'); $this->app->loadLang('testtask'); $caseLang = $this->lang->testcase; $caseConfig = $this->config->testcase; @@ -1198,6 +1199,7 @@ class testcase extends control $relatedStories = $this->dao->select('id,title')->from(TABLE_STORY) ->where('id')->in($relatedStoryIdList)->fetchPairs(); $relatedCases = $this->dao->select('id, title')->from(TABLE_CASE)->where('id')->in($relatedCaseIdList)->fetchPairs(); $relatedSteps = $this->dao->select('id,parent,`case`,version,type,`desc`,expect')->from(TABLE_CASESTEP)->where('`case`')->in(@array_keys($cases))->orderBy('version desc,id')->fetchGroup('case', 'id'); + $relatedFiles = $this->dao->select('id, objectID, pathname, title')->from(TABLE_FILE)->where('objectType')->eq('testcase')->andWhere('objectID')->in(@array_keys($cases))->andWhere('extra')->ne('editor')->fetchGroup('objectID'); $cases = $this->testcase->appendData($cases); foreach($cases as $case) @@ -1284,6 +1286,16 @@ class testcase extends control } $case->linkCase = join("; \n", $tmpLinkCases); } + + /* Set related files. */ + $case->files = ''; + if(isset($relatedFiles[$case->id])) + { + foreach($relatedFiles[$case->id] as $file) + { + $case->files .= $file->title . '
'; + } + } } if(isset($this->config->bizVersion)) list($fields, $cases) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $cases);