From 35b0c16a060fc24a0153d822bf94965591749ff9 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Tue, 10 Nov 2020 13:13:06 +0800
Subject: [PATCH] * Fix create project link product logic.

---
 db/update20.0.alpha.sql       | 2 +-
 db/zentao.sql                 | 2 +-
 module/program/control.php    | 2 +-
 module/program/lang/zh-tw.php | 4 ++++
 module/program/model.php      | 5 +++--
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/db/update20.0.alpha.sql b/db/update20.0.alpha.sql
index 957a26ba2e..f29cdf4c9e 100644
--- a/db/update20.0.alpha.sql
+++ b/db/update20.0.alpha.sql
@@ -321,7 +321,7 @@ CREATE TABLE IF NOT EXISTS `zt_weeklyreport`(
 REPLACE INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES 
 ('system','custom','','hourPoint','1'),
 ('system','custom','','URAndSR','1'),
-('system','custom','common','URSRName','{"URCommon":{"zh-cn":"\u7528\u6237\u9700\u6c42"},"SRCommon":{"zh-cn":"\u8f6f\u4ef6\u9700\u6c42"}}');
+('system','custom','common','URSRName','{\"URCommon\":{\"zh-cn\":\"\\u7528\\u6237\\u9700\\u6c42\"},\"SRCommon\":{\"zh-cn\":\"\\u8f6f\\u4ef6\\u9700\\u6c42\"}}');
 
 ALTER TABLE `zt_block` ADD `type` char(30) NOT NULL AFTER `module`;
 ALTER TABLE `zt_block` ADD UNIQUE `account_module_type_order` (`account`, `module`, `type`, `order`), DROP INDEX `accountModuleOrder`;
diff --git a/db/zentao.sql b/db/zentao.sql
index cd71138ae5..0073b7e7be 100644
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -4055,4 +4055,4 @@ INSERT INTO `zt_stage` (`name`,`percent`,`type`,`createdBy`,`createdDate`,`edite
 INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES 
 ('system','custom','','hourPoint','1'),
 ('system','custom','','URAndSR','1'),
-('system','custom','common','URSRName','{"URCommon":{"zh-cn":"\u7528\u6237\u9700\u6c42"},"SRCommon":{"zh-cn":"\u8f6f\u4ef6\u9700\u6c42"}}');
+('system','custom','common','URSRName','{\"URCommon\":{\"zh-cn\":\"\\u7528\\u6237\\u9700\\u6c42\"},\"SRCommon\":{\"zh-cn\":\"\\u8f6f\\u4ef6\\u9700\\u6c42\"}}');
diff --git a/module/program/control.php b/module/program/control.php
index 49e9aeb108..49007da4cc 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -1457,7 +1457,7 @@ class program extends control
 
         $this->loadModel('product');
         $project   = $this->project->getById($projectID);
-        $programID = $this->program->getPRJProgramID($projectID);
+        $programID = $this->program->getTopProgramID($projectID);
 
         /* Title and position. */
         $title      = $this->lang->project->manageProducts . $this->lang->colon . $project->name;
diff --git a/module/program/lang/zh-tw.php b/module/program/lang/zh-tw.php
index f0bbeaf8fd..4a448bdb9f 100644
--- a/module/program/lang/zh-tw.php
+++ b/module/program/lang/zh-tw.php
@@ -80,6 +80,8 @@ $lang->program->cv                 = 'CV%';
 $lang->program->PRJTeamCount       = '項目成員';
 $lang->program->PRJLongTime        = '長期項目';
 
+$lang->program->productNotEmpty = '關聯產品不能為空！';
+
 $lang->program->unitList['']       = '';
 $lang->program->unitList['yuan']   = '元';
 $lang->program->unitList['dollar'] = 'Dollars';
@@ -204,6 +206,8 @@ $lang->program->PGMLongTime  = '長期項目';
 
 $lang->program->noPGM         = '暫時沒有項目集';
 $lang->program->PGMShowClosed = '顯示已關閉';
+$lang->program->PGMTips       = '修改父項目集，可關聯產品也會發生變化，並且變為必填，如果未選擇任何項目集，則系統會預設創建一個和該項目同名的產品並關聯到該項目。';
+$lang->program->PGMChangeTips = '修改父項目集後，項目已關聯的產品會被清空，並且項目下的需求、bug等數據也會受影響，是否修改？';
 
 $lang->program->PGMAclList['open']    = "公開（有項目集視圖權限，即可訪問）";
 $lang->program->PGMAclList['private'] = "私有（項目集負責人和干係人可訪問）";
diff --git a/module/program/model.php b/module/program/model.php
index 123906d65f..556f400cf0 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -174,7 +174,8 @@ class programModel extends model
      */
     public function getPGMProduct($programID = 0)
     {
-        if(!empty($programID)) $programID = $this->getPRJProgramID($programID);
+        if(!$programID) return array();
+        $programID = $this->getTopProgramID($programID);
         return $this->loadModel('product')->getPairs('noclosed', $programID);
     }
 
@@ -928,7 +929,7 @@ class programModel extends model
      * @access public
      * @return object
      */
-    public function getPRJProgramID($projectID)
+    public function getTopProgramID($projectID)
     {
         if(empty($projectID)) return 0;
         $program  = $this->getPGMByID($projectID);