From 8f6763c14c9b0657769a9e68cf2d4aaef37a15eb Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Mon, 30 Nov 2020 17:02:36 +0800
Subject: [PATCH 1/3] * Remove expect.

---
 module/action/lang/de.php    | 1 -
 module/action/lang/en.php    | 1 -
 module/action/lang/fr.php    | 1 -
 module/action/lang/vi.php    | 1 -
 module/action/lang/zh-cn.php | 1 -
 module/action/lang/zh-tw.php | 1 -
 6 files changed, 6 deletions(-)

diff --git a/module/action/lang/de.php b/module/action/lang/de.php
index e49433c874..f4848a8685 100644
--- a/module/action/lang/de.php
+++ b/module/action/lang/de.php
@@ -89,7 +89,6 @@ $lang->action->objectTypes['caselib']     = 'Bibliothek';
 $lang->action->objectTypes['testreport']  = 'Berichte';
 $lang->action->objectTypes['entry']       = 'Eintrag';
 $lang->action->objectTypes['stakeholder'] = 'Stakeholder';
-$lang->action->objectTypes['expect']      = 'Expect';
 $lang->action->objectTypes['webhook']     = 'Webhook';
 
 /* 用来描述操作历史记录。*/
diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index 0ada6c3af0..c713c3e2e8 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -89,7 +89,6 @@ $lang->action->objectTypes['caselib']     = 'Library';
 $lang->action->objectTypes['testreport']  = 'Report';
 $lang->action->objectTypes['entry']       = 'Entry';
 $lang->action->objectTypes['stakeholder'] = 'Stakeholder';
-$lang->action->objectTypes['expect']      = 'Expect';
 $lang->action->objectTypes['webhook']     = 'Webhook';
 
 /* Used to describe operation history. */
diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php
index af0722f2f7..954db4c7e6 100644
--- a/module/action/lang/fr.php
+++ b/module/action/lang/fr.php
@@ -89,7 +89,6 @@ $lang->action->objectTypes['caselib']     = 'Library';
 $lang->action->objectTypes['testreport']  = 'Edition';
 $lang->action->objectTypes['entry']       = 'Entrée';
 $lang->action->objectTypes['stakeholder'] = 'Stakeholder';
-$lang->action->objectTypes['expect']      = 'Expect';
 $lang->action->objectTypes['webhook']     = 'Webhook';
 
 /* 用来描述操作历史记录。*/
diff --git a/module/action/lang/vi.php b/module/action/lang/vi.php
index 5136901db3..6b85097292 100644
--- a/module/action/lang/vi.php
+++ b/module/action/lang/vi.php
@@ -89,7 +89,6 @@ $lang->action->objectTypes['caselib']     = 'Thư viện';
 $lang->action->objectTypes['testreport']  = 'Báo cáo';
 $lang->action->objectTypes['entry']       = 'Entry';
 $lang->action->objectTypes['stakeholder'] = 'Stakeholder';
-$lang->action->objectTypes['expect']      = 'Expect';
 $lang->action->objectTypes['webhook']     = 'Webhook';
 
 /* Used to describe operation history. */
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index bb9ab7221f..0783c8790d 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -89,7 +89,6 @@ $lang->action->objectTypes['caselib']     = '用例库';
 $lang->action->objectTypes['testreport']  = '报告';
 $lang->action->objectTypes['entry']       = '应用';
 $lang->action->objectTypes['stakeholder'] = '干系人';
-$lang->action->objectTypes['expect']      = '期望';
 $lang->action->objectTypes['webhook']     = 'Webhook';
 
 /* 用来描述操作历史记录。*/
diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php
index 4e4087a5fb..b046865c14 100755
--- a/module/action/lang/zh-tw.php
+++ b/module/action/lang/zh-tw.php
@@ -89,7 +89,6 @@ $lang->action->objectTypes['caselib']     = '用例庫';
 $lang->action->objectTypes['testreport']  = '報告';
 $lang->action->objectTypes['entry']       = '應用';
 $lang->action->objectTypes['stakeholder'] = '干係人';
-$lang->action->objectTypes['expect']      = '期望';
 $lang->action->objectTypes['webhook']     = 'Webhook';
 
 /* 用來描述操作歷史記錄。*/

From ecf6f6643c76d5746ba672ed2020dd44590dd913 Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Mon, 30 Nov 2020 17:19:03 +0800
Subject: [PATCH 2/3] * Finish task#8543.

---
 module/action/lang/de.php    | 2 +-
 module/action/lang/en.php    | 2 +-
 module/action/lang/fr.php    | 2 +-
 module/action/lang/vi.php    | 2 +-
 module/action/lang/zh-cn.php | 2 +-
 module/action/lang/zh-tw.php | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/module/action/lang/de.php b/module/action/lang/de.php
index f4848a8685..f2131af14f 100644
--- a/module/action/lang/de.php
+++ b/module/action/lang/de.php
@@ -426,7 +426,7 @@ $lang->action->label->space       = ' ';
 $lang->action->label->risk        = 'Risk|risk|view|riskID=%s';
 $lang->action->label->issue       = 'Issue|issue|view|issueID=%s';
 $lang->action->label->design      = 'Design|design|view|designID=%s';
-$lang->action->label->stakeholder = 'Stakeholder|stakeholder|browse|';
+$lang->action->label->stakeholder = 'Stakeholder|stakeholder|view|userID=%s';
 
 /* Object type. */
 $lang->action->search->objectTypeList['']            = '';    
diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index c713c3e2e8..858db24d6d 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -426,7 +426,7 @@ $lang->action->label->space       = ' ';
 $lang->action->label->risk        = 'Risk|risk|view|riskID=%s';
 $lang->action->label->issue       = 'Issue|issue|view|issueID=%s';
 $lang->action->label->design      = 'Design|design|view|designID=%s';
-$lang->action->label->stakeholder = 'Stakeholder|stakeholder|browse|';
+$lang->action->label->stakeholder = 'Stakeholder|stakeholder|view|userID=%s';
 
 /* Object type. */
 $lang->action->search->objectTypeList['']            = '';    
diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php
index 954db4c7e6..a505c475d6 100644
--- a/module/action/lang/fr.php
+++ b/module/action/lang/fr.php
@@ -426,7 +426,7 @@ $lang->action->label->space       = ' ';
 $lang->action->label->risk        = 'Risk|risk|view|riskID=%s';
 $lang->action->label->issue       = 'Issue|issue|view|issueID=%s';
 $lang->action->label->design      = 'Design|design|view|designID=%s';
-$lang->action->label->stakeholder = 'Stakeholder|stakeholder|browse|';
+$lang->action->label->stakeholder = 'Stakeholder|stakeholder|view|userID=%s';
 
 /* Object type. */
 $lang->action->search->objectTypeList['']            = '';    
diff --git a/module/action/lang/vi.php b/module/action/lang/vi.php
index 6b85097292..b333d6be9c 100644
--- a/module/action/lang/vi.php
+++ b/module/action/lang/vi.php
@@ -426,7 +426,7 @@ $lang->action->label->space       = ' ';
 $lang->action->label->risk        = 'Risk|risk|view|riskID%s';
 $lang->action->label->issue       = 'Issue|issue|view|issueID=%s';
 $lang->action->label->design      = 'Design|design|view|designID=%s';
-$lang->action->label->stakeholder = 'Stakeholder|stakeholder|browse|';
+$lang->action->label->stakeholder = 'Stakeholder|stakeholder|view|userID=%s';
 
 /* Object type. */
 $lang->action->search->objectTypeList['']            = ''; 
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 0783c8790d..d7af102f3b 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -426,7 +426,7 @@ $lang->action->label->space       = ' ';
 $lang->action->label->risk        = '风险|risk|view|riskID=%s';
 $lang->action->label->issue       = '问题|issue|view|issueID=%s';
 $lang->action->label->design      = '设计|design|view|designID=%s';
-$lang->action->label->stakeholder = '干系人|stakeholder|browse|';
+$lang->action->label->stakeholder = '干系人|stakeholder|view|userID=%s';
 
 /* Object type. */
 $lang->action->search->objectTypeList['']            = '';
diff --git a/module/action/lang/zh-tw.php b/module/action/lang/zh-tw.php
index b046865c14..aae749283d 100755
--- a/module/action/lang/zh-tw.php
+++ b/module/action/lang/zh-tw.php
@@ -413,7 +413,7 @@ $lang->action->label->webhook     = 'Webhook|webhook|browse|';
 $lang->action->label->space       = ' ';
 $lang->action->label->risk        = '風險|risk|view|riskID=%s';
 $lang->action->label->design      = '設計|design|view|designID=%s';
-$lang->action->label->stakeholder = '干係人|stakeholder|browse|';
+$lang->action->label->stakeholder = '干係人|stakeholder|view|userID=%s';
 
 /* Object type. */
 $lang->action->search->objectTypeList['']            = '';

From 6745b96e1f337ae91adc6a91698b409b62df2982 Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Mon, 30 Nov 2020 17:26:20 +0800
Subject: [PATCH 3/3] * Finish task#8544.

---
 module/action/config.php | 2 ++
 module/action/model.php  | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/module/action/config.php b/module/action/config.php
index 7631912b80..842777cd18 100755
--- a/module/action/config.php
+++ b/module/action/config.php
@@ -37,3 +37,5 @@ $config->action->majorList['release'] = array('opened');
 $config->action->majorList['build']   = array('opened');
 $config->action->majorList['product'] = array('opened', 'edited');
 $config->action->majorList['project'] = array('opened', 'edited');
+
+$config->action->needGetPRJType = 'story,build,task,bug,case,testcase,caselib,testtask,testsuite,testreport,doc,issue,release,risk,design';
diff --git a/module/action/model.php b/module/action/model.php
index d1f01f0eb2..fbf6618024 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -806,8 +806,7 @@ class actionModel extends model
             $field     = $this->config->action->objectNameFields[$objectType];
             if($table != TABLE_TODO)
             {
-                $needGetPRJType = 'story,build,task,bug,case,testcase,caselib,testtask,testsuite,testreport,doc,issue,release,risk,design';
-                if(strpos($needGetPRJType, $objectType) !== false)
+                if(strpos($this->config->action->needGetPRJType, $objectType) !== false)
                 {
                     $objectInfo = $this->dao->select("id, PRJ, $field AS name")->from($table)->where('id')->in($objectIds)->fetchAll();
                     foreach($objectInfo as $object)
@@ -816,7 +815,7 @@ class actionModel extends model
                         $objectPRJ[$object->id]  = $object->PRJ;
                     }
                 }
-                elseif($objectType == 'program' or $objectType == 'project' or $objectType == 'execution')
+                elseif($objectType == 'project' or $objectType == 'execution')
                 {
                     $objectInfo = $this->dao->select("id, project, $field AS name")->from($table)->where('id')->in($objectIds)->fetchAll();
                     foreach($objectInfo as $object)