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

Merge branch '15.0'

Browse Source
This commit is contained in:
wangyidong
2021-07-06 19:28:30 +08:00
parent 1d11be7552 396954c678
commit fa4fa5941e
165 changed files with 4714 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/config.php
+1 -1
View File
@@ -70,7 +70,7 @@ $config->testcase->search['params']['stage'] = array('operator' => 'inclu
$config->testcase->search['params']['lib'] = array('operator' => '=', 'control' => 'select', 'values' => '');
$config->testcase->search['params']['lastRunner'] = array('operator' => '=', 'control' => 'select', 'values' => 'users');
$config->testcase->search['params']['lastRunResult'] = array('operator' => '=', 'control' => 'select', 'values' => array_diff($lang->testcase->resultList, array('n/a' => $lang->testcase->resultList['n/a'])));
$config->testcase->search['params']['lastRunResult'] = array('operator' => '=', 'control' => 'select', 'values' => array_diff($lang->testcase->resultList, array('n/a' => $lang->testcase->resultList['n/a'])) + array('' => ''));
$config->testcase->search['params']['lastRunDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->testcase->search['params']['openedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->testcase->search['params']['lastEditedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
module/testcase/js/common.js
+11
View File
@@ -301,6 +301,17 @@ function initSteps(selector)
suggestType = suggestChild ? 'item' : 'step';
}
$step.find('.step-type').val(suggestType);
/* Auto insert step to group without any steps */
if(suggestType === 'group')
{
var $nextStep = $step.next('.step:not(.drag-shadow)');
if(!$nextStep.length || $nextStep.find('.step-type').val() !== 'item')
{
insertStepRow($step, 1, 'item', true);
}
}
refreshSteps();
}).on('change', '.form-control', function()
{
module/testcase/model.php
+8 -2
View File
@@ -170,7 +170,10 @@ class testcaseModel extends model
foreach($extendFields as $extendField)
{
$data[$i]->{$extendField->field} = htmlspecialchars($this->post->{$extendField->field}[$i]);
$data[$i]->{$extendField->field} = $this->post->{$extendField->field}[$i];
if(is_array($data[$i]->{$extendField->field})) $data[$i]->{$extendField->field} = join(',', $data[$i]->{$extendField->field});
$data[$i]->{$extendField->field} = htmlspecialchars($data[$i]->{$extendField->field});
$message = $this->checkFlowRule($extendField, $data[$i]->{$extendField->field});
if($message) die(js::alert($message));
}
@@ -854,7 +857,10 @@ class testcaseModel extends model
foreach($extendFields as $extendField)
{
$case->{$extendField->field} = htmlspecialchars($this->post->{$extendField->field}[$caseID]);
$case->{$extendField->field} = $this->post->{$extendField->field}[$caseID];
if(is_array($case->{$extendField->field})) $case->{$extendField->field} = join(',', $case->{$extendField->field});
$case->{$extendField->field} = htmlspecialchars($case->{$extendField->field});
$message = $this->checkFlowRule($extendField, $case->{$extendField->field});
if($message) die(js::alert($message));
}