diff --git a/module/execution/model.php b/module/execution/model.php index ac295f910d..35a0472e04 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -3391,7 +3391,7 @@ class executionModel extends model $days = count($dateList) - 1; $rate = $days ? $firstTime / $days : ''; $baselineJSON = '['; - foreach($dateList as $i => $date) $baselineJSON .= round(($days - $i) * $rate, 1) . ','; + foreach($dateList as $i => $date) $baselineJSON .= round(($days - $i) * (int)$rate, 1) . ','; $baselineJSON = rtrim($baselineJSON, ',') . ']'; $chartData['labels'] = $this->report->convertFormat($dateList, DT_DATE5); diff --git a/module/gitlab/model.php b/module/gitlab/model.php index 1d3b31d592..0942deab50 100644 --- a/module/gitlab/model.php +++ b/module/gitlab/model.php @@ -408,7 +408,7 @@ class gitlabModel extends model { $results = json_decode(commonModel::http($host . "?private_token={$gitlab->token}&simple=true&membership=true&page={$page}&per_page=100")); if(empty($results) or $page > 10) break; - $allResults = $allResults + $results; + $allResults = array_merge($allResults, $results); } return $allResults; diff --git a/module/product/model.php b/module/product/model.php index 7a50d3feb0..e9e891a509 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -1101,7 +1101,7 @@ class productModel extends model foreach($executions as $id => $execution) $projectIdList[$execution->project] = $execution->project; $executionPairs = array(0 => ''); - $projectPairs = $this->loadModel('project')->getPairsByIdList($projectIdList); + $projectPairs = $this->loadModel('project')->getPairsByIdList($projectIdList, 'all'); foreach($executions as $id => $execution) { if($execution->grade == 2 && isset($executions[$execution->parent])) diff --git a/module/testcase/model.php b/module/testcase/model.php index 9042ef66d2..5cd3c5d8b4 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -1478,7 +1478,7 @@ class testcaseModel extends model $id = $col->id; if($col->show) { - $class = 'c-' . $id; + $class = $id == 'title' ? 'c-name' : 'c-' . $id; $title = ''; if($id == 'title') { diff --git a/module/user/view/login.html.php b/module/user/view/login.html.php index b39efc1e0d..acc432cfaa 100644 --- a/module/user/view/login.html.php +++ b/module/user/view/login.html.php @@ -35,11 +35,11 @@ if(empty($config->notMd5Pwd))js::import($jsRoot . 'md5.js');