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

Merge branch 'sprint/191_liumengyi_54354' into 'master'

Browse Source 
Sprint/191 liumengyi 54354

See merge request easycorp/zentaopms!3461
This commit is contained in:
李玉春
2022-05-17 09:28:22 +00:00
parent 782e860754 bff314e0d4
commit 1f768098c6
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/custom/config.php
+2 -2
View File
@@ -56,8 +56,8 @@ $config->custom->fieldList['build'] = 'scmPath,filePath,desc';
$config->custom->fieldList['bug']['create'] = 'module,project,deadline,type,os,browser,severity,pri,steps,keywords';
$config->custom->fieldList['bug']['edit'] = 'plan,project,assignedTo,deadline,type,os,browser,severity,pri,steps,keywords';
$config->custom->fieldList['bug']['resolve'] = 'resolvedBuild,resolvedDate,assignedTo,comment';
$config->custom->fieldList['testcase']['create'] = 'stage,story,pri,precondition,keywords';
$config->custom->fieldList['testcase']['edit'] = 'stage,story,pri,precondition,keywords,status';
$config->custom->fieldList['testcase']['create'] = 'stage,story,pri,precondition,keywords,module';
$config->custom->fieldList['testcase']['edit'] = 'stage,story,pri,precondition,keywords,status,module';
$config->custom->fieldList['testsuite'] = 'desc';
$config->custom->fieldList['caselib'] = 'desc';
$config->custom->fieldList['testcase']['createcase'] = 'lib,stage,pri,precondition,keywords';
module/testcase/model.php
+8 -8
View File
@@ -179,7 +179,7 @@ class testcaseModel extends model
foreach(explode(',', $this->config->testcase->create->requiredFields) as $field)
{
$field = trim($field);
if($field and empty($data[$i]->$field)) return print(js::alert(sprintf($this->lang->error->notempty, $this->lang->testcase->$field)));
if($field and empty($data[$i]->$field)) return helper::end(js::alert(sprintf($this->lang->error->notempty, $this->lang->testcase->$field)));
}
}
@@ -1018,7 +1018,7 @@ class testcaseModel extends model
}
else
{
return print(js::error('case#' . $caseID . dao::getError(true)));
return helper::end(js::error('case#' . $caseID . dao::getError(true)));
}
}
@@ -2005,8 +2005,8 @@ class testcaseModel extends model
/**
* Build test case menu.
*
* @param object $case
* @param string $type
* @param object $case
* @param string $type
* @access public
* @return string
*/
@@ -2019,7 +2019,7 @@ class testcaseModel extends model
/**
* Build test case view menu.
*
* @param object $case
* @param object $case
* @access public
* @return string
*/
@@ -2067,11 +2067,11 @@ class testcaseModel extends model
{
if(!isonlybody()) $menu .= $this->buildMenu('testcase', 'edit', $params, $case, 'view', '', '', 'showinonlybody');
if(!$case->isLibCase && $case->auto != 'unit')
{
{
$menu .= $this->buildMenu('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase&param=$case->id", $case, 'view', 'copy');
}
if($case->isLibCase && common::hasPriv('caselib', 'createCase'))
{
{
echo html::a(helper::createLink('caselib', 'createCase', "libID=$case->lib&moduleID=$case->module&param=$case->id"), "<i class='icon-copy'></i>", '', "class='btn' title='{$this->lang->testcase->copy}'");
}
@@ -2084,7 +2084,7 @@ class testcaseModel extends model
/**
* Build test case browse menu.
*
* @param object $case
* @param object $case
* @access public
* @return string
*/