From 54853f38fecb5fa8df5359c6385e5f76d127a3de Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Thu, 19 Nov 2020 14:59:51 +0800
Subject: [PATCH] * Create waterfall projects with multi-product single product
 removal.

---
 module/program/control.php             | 14 +++++++-------
 module/program/view/prjcreate.html.php |  6 ------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/module/program/control.php b/module/program/control.php
index d2de9572f6..89181a0cec 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -725,13 +725,13 @@ class program extends control
 
         if($copyProjectID)
         {
-            $copyProgram = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($copyProjectID)->fetch();
-            $name        = $copyProgram->name;
-            $code        = $copyProgram->code;
-            $team        = $copyProgram->team;
-            $acl         = $copyProgram->acl;
-            $auth        = $copyProgram->auth;
-            $whitelist   = $copyProgram->whitelist;
+            $copyProject = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($copyProjectID)->fetch();
+            $name        = $copyProject->name;
+            $code        = $copyProject->code;
+            $team        = $copyProject->team;
+            $acl         = $copyProject->acl;
+            $auth        = $copyProject->auth;
+            $whitelist   = $copyProject->whitelist;
 
             $products = $this->project->getProducts($copyProjectID);
             foreach($products as $product)
diff --git a/module/program/view/prjcreate.html.php b/module/program/view/prjcreate.html.php
index 80a69db786..160b56db92 100644
--- a/module/program/view/prjcreate.html.php
+++ b/module/program/view/prjcreate.html.php
@@ -50,12 +50,6 @@
           <th><?php echo $lang->program->PRJCode;?></th>
           <td><?php echo html::input('code', $code, "class='form-control' required");?></td><td></td><td></td>
         </tr>
-        <?php if($model == 'waterfall'):?>
-        <tr>
-          <th><?php echo $lang->program->PRJCategory;?></th>
-          <td><?php echo html::select('product', $lang->program->PRJCategoryList, '', "class='form-control'");?></td><td></td><td></td>
-        </tr>
-        <?php endif;?>
         <tr>
           <th><?php echo $lang->project->manageProducts;?></th>
           <td class='text-left' id='productsBox' colspan="3">