From fb943e01bd9e7e64628f77fd535d4f1593be58fd Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Wed, 17 Mar 2021 11:39:10 +0800 Subject: [PATCH] * Adjust code. --- module/execution/lang/zh-cn.php | 1 + module/execution/model.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php index fe6c85a8a0..0cd07090ca 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -70,6 +70,7 @@ $lang->execution->undone = '未完成'; $lang->execution->unclosed = '未关闭'; $lang->execution->typeDesc = "运维{$lang->executionCommon}没有{$lang->SRCommon}、bug、版本、测试功能。"; $lang->execution->mine = '我负责:'; +$lang->execution->involved = '我参与:'; $lang->execution->other = '其他:'; $lang->execution->deleted = '已删除'; $lang->execution->delayed = '已延期'; diff --git a/module/execution/model.php b/module/execution/model.php index 7a65957a9b..722819134d 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -3559,7 +3559,7 @@ class executionModel extends model $productPairs = $this->getStageLinkProductPairs($stageIdList); $recentExecutions = isset($this->config->execution->recentExecutions) ? explode(',', $this->config->execution->recentExecutions) : array(); - $allExecution = array('recent' => array(), 'mine' => array()); + $allExecution = array('recent' => array(), 'involved' => array()); foreach($executions as $execution) { if($execution->type == 'stage') $execution->name = zget($projectPairs, $execution->project) . '/' . zget($productPairs, $execution->id) . '/' . $execution->name; @@ -3570,7 +3570,7 @@ class executionModel extends model $allExecution['recent'][$index] = $execution; continue; } - $allExecution['mine'][] = $execution; + $allExecution['involved'][] = $execution; } ksort($allExecution['recent']);