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

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

Browse Source
This commit is contained in:
hufangzhou
2021-08-31 16:00:41 +08:00
parent 8cd6a20a38 84782b70c3
commit 9778deb98f
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+1 -1
View File
@@ -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);
module/gitlab/model.php
+1 -1
View File
@@ -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;
module/product/model.php
+1 -1
View File
@@ -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]))
module/testcase/model.php
+1 -1
View File
@@ -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')
{
module/user/view/login.html.php
+2 -2
View File
@@ -35,11 +35,11 @@ if(empty($config->notMd5Pwd))js::import($jsRoot . 'md5.js');
<tbody>
<tr>
<th><?php echo $lang->user->account;?></th>
<td><input class='form-control' type='text' name='account' id='account' autofocus /></td>
<td><input class='form-control' type='text' name='account' id='account' autocomplete='off' autofocus /></td>
</tr>
<tr>
<th><?php echo $lang->user->password;?></th>
<td><input class='form-control' type='password' name='password' /></td>
<td><input class='form-control' type='password' name='password' autocomplete='off' /></td>
</tr>
<?php if(!empty($this->config->safe->loginCaptcha)):?>
<tr>