From c658c271f4ea9706bf1a9aabfedcdabfb0d9f0f7 Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Mon, 23 Nov 2020 20:55:42 +0800
Subject: [PATCH] * Finish task#8465.

---
 module/program/lang/de.php    |  2 +-
 module/program/lang/en.php    |  2 +-
 module/program/lang/fr.php    |  2 +-
 module/program/lang/vi.php    |  2 +-
 module/program/lang/zh-cn.php |  2 +-
 module/program/lang/zh-tw.php |  2 +-
 module/program/model.php      | 34 ++++++++++++++++++++++------------
 7 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/module/program/lang/de.php b/module/program/lang/de.php
index 7986041dd5..fb1ebcf198 100644
--- a/module/program/lang/de.php
+++ b/module/program/lang/de.php
@@ -87,7 +87,7 @@ $lang->program->cv                 = 'CV%';
 $lang->program->PRJTeamCount       = 'Team';
 $lang->program->PRJLongTime        = 'Long-Term Project';
 
-$lang->program->productNotEmpty = 'Affiliated products cannot be empty!';
+$lang->program->productNotEmpty = 'Please link products or create products.';
 
 $lang->program->unitList['']       = '';
 $lang->program->unitList['yuan']   = 'Yuan';
diff --git a/module/program/lang/en.php b/module/program/lang/en.php
index 7986041dd5..fb1ebcf198 100644
--- a/module/program/lang/en.php
+++ b/module/program/lang/en.php
@@ -87,7 +87,7 @@ $lang->program->cv                 = 'CV%';
 $lang->program->PRJTeamCount       = 'Team';
 $lang->program->PRJLongTime        = 'Long-Term Project';
 
-$lang->program->productNotEmpty = 'Affiliated products cannot be empty!';
+$lang->program->productNotEmpty = 'Please link products or create products.';
 
 $lang->program->unitList['']       = '';
 $lang->program->unitList['yuan']   = 'Yuan';
diff --git a/module/program/lang/fr.php b/module/program/lang/fr.php
index 7986041dd5..fb1ebcf198 100644
--- a/module/program/lang/fr.php
+++ b/module/program/lang/fr.php
@@ -87,7 +87,7 @@ $lang->program->cv                 = 'CV%';
 $lang->program->PRJTeamCount       = 'Team';
 $lang->program->PRJLongTime        = 'Long-Term Project';
 
-$lang->program->productNotEmpty = 'Affiliated products cannot be empty!';
+$lang->program->productNotEmpty = 'Please link products or create products.';
 
 $lang->program->unitList['']       = '';
 $lang->program->unitList['yuan']   = 'Yuan';
diff --git a/module/program/lang/vi.php b/module/program/lang/vi.php
index 7986041dd5..fb1ebcf198 100644
--- a/module/program/lang/vi.php
+++ b/module/program/lang/vi.php
@@ -87,7 +87,7 @@ $lang->program->cv                 = 'CV%';
 $lang->program->PRJTeamCount       = 'Team';
 $lang->program->PRJLongTime        = 'Long-Term Project';
 
-$lang->program->productNotEmpty = 'Affiliated products cannot be empty!';
+$lang->program->productNotEmpty = 'Please link products or create products.';
 
 $lang->program->unitList['']       = '';
 $lang->program->unitList['yuan']   = 'Yuan';
diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php
index 8d97bf3531..67d0badea0 100644
--- a/module/program/lang/zh-cn.php
+++ b/module/program/lang/zh-cn.php
@@ -87,7 +87,7 @@ $lang->program->cv                 = 'CV%';
 $lang->program->PRJTeamCount       = '项目成员';
 $lang->program->PRJLongTime        = '长期';
 
-$lang->program->productNotEmpty = '关联产品不能为空！';
+$lang->program->productNotEmpty = '请关联产品或创建产品。';
 
 $lang->program->unitList['']       = '';
 $lang->program->unitList['yuan']   = '元';
diff --git a/module/program/lang/zh-tw.php b/module/program/lang/zh-tw.php
index 293e20c247..835841cd96 100644
--- a/module/program/lang/zh-tw.php
+++ b/module/program/lang/zh-tw.php
@@ -85,7 +85,7 @@ $lang->program->cv                 = 'CV%';
 $lang->program->PRJTeamCount       = '項目成員';
 $lang->program->PRJLongTime        = '長期';
 
-$lang->program->productNotEmpty = '關聯產品不能為空！';
+$lang->program->productNotEmpty = '請關聯產品或創建產品。';
 
 $lang->program->unitList['']       = '';
 $lang->program->unitList['yuan']   = '元';
diff --git a/module/program/model.php b/module/program/model.php
index 6131826848..b830db1bad 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -1208,13 +1208,18 @@ class programModel extends model
 
                 if(dao::isError()) return false;
             }
+        }
 
-            /* Judge products not empty. */
-            if(!$_POST['products'][0])
-            {
-                dao::$errors[] = $this->lang->program->productNotEmpty;
-                return false;
-            }
+        /* Judge products not empty. */
+        $linkedProductsCount = 0;
+        foreach($_POST['products'] as $product)
+        {
+            if(!empty($product)) $linkedProductsCount++;
+        }
+        if(empty($linkedProductsCount))
+        {
+            dao::$errors[] = $this->lang->program->productNotEmpty;
+            return false;
         }
 
         $requiredFields = $this->config->program->PRJCreate->requiredFields;
@@ -1336,13 +1341,18 @@ class programModel extends model
 
                 if(dao::isError()) return false;
             }
+        }
 
-            /* Judge products not empty. */
-            if(!$_POST['products'][0])
-            {
-                dao::$errors[] = $this->lang->program->productNotEmpty;
-                return false;
-            }
+        /* Judge products not empty. */
+        $linkedProductsCount = 0;
+        foreach($_POST['products'] as $product)
+        {
+            if(!empty($product)) $linkedProductsCount++;
+        }
+        if(empty($linkedProductsCount))
+        {
+            dao::$errors[] = $this->lang->program->productNotEmpty;
+            return false;
         }
 
         $project = $this->loadModel('file')->processImgURL($project, $this->config->program->editor->prjedit['id'], $this->post->uid);