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

* Adjust code.

Browse Source
This commit is contained in:
qiyu-xie
2021-07-16 11:22:05 +08:00
parent 4eb641ad81
commit 2c27035699
5 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
module/install/view/step4.html.php
View File

@@ -64,7 +64,8 @@
</tr>
<tr>
<th><?php echo $lang->install->selectedMode;?></th>
<td><?php $systemMode = isset($lang->upgrade->to15Mode['classic']) ? 'classic' : 'new';?>
<td>
<?php $systemMode = isset($lang->upgrade->to15Mode['classic']) ? 'classic' : 'new';?>
<?php echo html::radio('mode', $lang->upgrade->to15Mode, $systemMode);?>
</td>
</tr>

2
module/task/model.php
View File

@@ -1298,7 +1298,7 @@ class taskModel extends model
if($task->status == 'closed') $this->loadModel('score')->create('task', 'close', $taskID);
$allChanges[$taskID] = common::createChanges($oldTask, $task);
/* update task to gitlab issue. */
/* Update task to gitlab issue. */
$this->loadModel('gitlab');
$relation = $this->gitlab->getRelationByObject('task', $taskID);
if(!empty($relation)) $this->gitlab->apiUpdateIssue($relation->gitlabID, $relation->projectID, $relation->issueID, 'task', $task, $taskID);

1
module/testtask/model.php
View File

@@ -2188,6 +2188,7 @@ class testtaskModel extends model
$caseStep->type = 'step';
$caseStep->desc = '';
$caseStep->expect = $step->checkPoints[0]->expect;
$case->steps[] = $caseStep;
}
$result->caseResult = $stepStatus;