Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug #7914.

Browse Source
This commit is contained in:
holan20180123
2020-09-15 17:20:19 +08:00
parent 93581b34b4
commit 08c1428b30
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/config.php
+1 -1
View File
@@ -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';
module/testcase/control.php
+12
View File
@@ -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 . '<br />';
}
}
}
if(isset($this->config->bizVersion)) list($fields, $cases) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $cases);