Merge branch 'master_xieqiyu_66955' into 'master'

Master xieqiyu 66955

See merge request easycorp/zentaopms!5219
This commit is contained in:
王怡栋
2022-09-01 03:05:12 +00:00
13 changed files with 83 additions and 12 deletions
+11 -2
View File
@@ -192,7 +192,16 @@ class bugModel extends model
foreach($data->title as $i => $title)
{
$title = trim($title);
if(empty($title)) continue;
if(empty($title))
{
if($this->common->checkValidRow('bug', $data, $i))
{
dao::$errors['message'][] = sprintf($this->lang->error->notempty, $this->lang->bug->title);
return false;
}
continue;
}
$bug = new stdClass();
$bug->openedBy = $this->app->user->account;
@@ -202,7 +211,7 @@ class bugModel extends model
$bug->module = (int)$data->modules[$i];
$bug->project = (int)$data->projects[$i];
$bug->execution = (int)$data->executions[$i];
$bug->openedBuild = implode(',', $data->openedBuilds[$i]);
$bug->openedBuild = isset($data->openedBuilds) ? implode(',', $data->openedBuilds[$i]) : '';
$bug->color = $data->color[$i];
$bug->title = $title;
$bug->deadline = $data->deadlines[$i];