From 47d7d7a92d97fd3136f9deee7c4e0f1f33b1903f Mon Sep 17 00:00:00 2001
From: songchenxuan <songchenxuan@easycorp.ltd>
Date: Thu, 23 Dec 2021 15:24:23 +0800
Subject: [PATCH] *Fix bug #17682.

---
 module/execution/config.php        | 2 +-
 module/execution/lang/en.php       | 1 +
 module/execution/lang/zh-cn.php    | 1 +
 module/execution/view/all.html.php | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/module/execution/config.php b/module/execution/config.php
index c569d8ac16..ec4ef74386 100644
--- a/module/execution/config.php
+++ b/module/execution/config.php
@@ -7,7 +7,7 @@ $config->execution->weekend          = '2';
 $config->execution->ownerFields      = array('PO', 'PM', 'QD', 'RD');
 
 $config->execution->list = new stdclass();
-$config->execution->list->exportFields = 'id,name,code,PM,end,status,totalEstimate,totalConsumed,totalLeft,progress';
+$config->execution->list->exportFields = 'id,name,projectName,code,PM,end,status,totalEstimate,totalConsumed,totalLeft,progress';
 
 $config->execution->modelList['scrum']     = 'sprint';
 $config->execution->modelList['waterfall'] = 'stage';
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index 1f5ecdef08..6d7354dca2 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -15,6 +15,7 @@ $lang->execution->allExecutionAB   = 'Execution List';
 $lang->execution->id               = $lang->executionCommon . ' ID';
 $lang->execution->type             = $lang->executionCommon . 'Type';
 $lang->execution->name             = $lang->executionCommon . 'Name';
+$lang->execution->projectName      = 'Project';
 $lang->execution->code             = $lang->executionCommon . 'Code';
 $lang->execution->project          = 'Project';
 $lang->execution->execName         = 'Execution Name';
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index 5201ad72df..5bc2957a0e 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -15,6 +15,7 @@ $lang->execution->allExecutionAB   = "{$lang->execution->common}列表";
 $lang->execution->id               = $lang->executionCommon . '编号';
 $lang->execution->type             = $lang->executionCommon . '类型';
 $lang->execution->name             = $lang->executionCommon . '名称';
+$lang->execution->projectName      = '所属项目';
 $lang->execution->code             = $lang->executionCommon . '代号';
 $lang->execution->project          = '所属项目';
 $lang->execution->execName         = "{$lang->execution->common}名称";
diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php
index 7ebca2d4bd..7b152d8ae3 100644
--- a/module/execution/view/all.html.php
+++ b/module/execution/view/all.html.php
@@ -77,7 +77,7 @@
           </th>
           <th><?php common::printOrderLink('name', $orderBy, $vars, (($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->execName : $lang->execution->name);?></th>
           <?php if($config->systemMode == 'new'):?>
-          <th class='c-begin'><?php common::printOrderLink('projectName', $orderBy, $vars, $lang->execution->project);?></th></th>
+          <th class='c-begin'><?php common::printOrderLink('projectName', $orderBy, $vars, $lang->execution->projectName);?></th></th>
           <?php endif;?>
           <th class='c-pm'><?php common::printOrderLink('PM', $orderBy, $vars, $lang->execution->owner);?></th>
           <th class='c-status'><?php common::printOrderLink('status', $orderBy, $vars, $from == 'execution' ? $lang->execution->execStatus : $lang->execution->status);?></th>