From b8598ce6ce47a620a6eabbd5b8b5c17d84819feb Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Mon, 28 Dec 2020 15:17:10 +0800
Subject: [PATCH] * Adjust code style.

---
 module/my/view/project.html.php              | 2 +-
 module/product/model.php                     | 3 ++-
 module/productplan/js/browse.js              | 4 ++--
 module/program/view/pgmbrowsebylist.html.php | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/module/my/view/project.html.php b/module/my/view/project.html.php
index 0f85ea71e7..8b6345bc3e 100644
--- a/module/my/view/project.html.php
+++ b/module/my/view/project.html.php
@@ -39,7 +39,7 @@
           <th class='c-id w-50px'><?php echo $lang->idAB;?></th>
           <th><?php echo $lang->program->PRJName;?></th>
           <th class='w-100px'><?php echo $lang->program->PRJCode;?></th>
-          <th class='w-80px'><?php  echo $lang->program->PRJStatus;?></th>
+          <th class='w-80px'> <?php echo $lang->program->PRJStatus;?></th>
           <th class='w-100px'><?php echo $lang->program->begin;?></th>
           <th class='w-100px'><?php echo $lang->program->end;?></th>
           <th class='w-100px'><?php echo $lang->program->PRJBudget;?></th>
diff --git a/module/product/model.php b/module/product/model.php
index 7487720b01..52b8d87584 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -811,7 +811,7 @@ class productModel extends model
      * @param  int    $productID
      * @param  int    $branch
      * @access public
-     * @return void
+     * @return array
      */
     public function getProjectPairsByProduct($productID, $branch = 0)
     {
@@ -1222,6 +1222,7 @@ class productModel extends model
             foreach($products as $product) $programKeys[] = $product->program;
             $programs = $this->dao->select('id,name')->from(TABLE_PROGRAM)
                 ->where('id')->in(array_unique($programKeys))
+                ->andWhere('deleted')->eq('0')
                 ->fetchPairs();
 
             foreach($products as $product) $product->programName = isset($programs[$product->program]) ? $programs[$product->program] : '';
diff --git a/module/productplan/js/browse.js b/module/productplan/js/browse.js
index d5765c2c1f..85b3864e43 100644
--- a/module/productplan/js/browse.js
+++ b/module/productplan/js/browse.js
@@ -22,8 +22,8 @@ $(function()
 
     $('#createExecutionButton').on('click', function()
     {
-        var PRJID = $('#project').val();
-        var planID    = $('#planID').val();
+        var PRJID  = $('#project').val();
+        var planID = $('#planID').val();
         parent.location.href = createLink('project', 'create', 'productID=' + productID + '&projectID=&copyProjectID=&planID=' + planID, '', '', PRJID);
     });
 });
diff --git a/module/program/view/pgmbrowsebylist.html.php b/module/program/view/pgmbrowsebylist.html.php
index 67402a77df..cb8307143c 100644
--- a/module/program/view/pgmbrowsebylist.html.php
+++ b/module/program/view/pgmbrowsebylist.html.php
@@ -71,7 +71,7 @@
           </div>
           <?php common::printIcon('program', 'PGMEdit',   "programID=$program->id", '', 'list', 'edit');?>
           <?php common::printIcon('program', 'PGMCreate', "programID=$program->id", '', 'list', 'treemap-alt', '', '', '', '', $this->lang->program->PGMChildren);?>
-          <?php if(common::hasPriv('program', 'PGMDelete')) echo html::a($this->createLink("program", "pgmdelete", "programID=$program->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn' title='{$this->lang->program->PGMDelete}'");?>
+          <?php if(common::hasPriv('program', 'PGMDelete')) echo html::a($this->createLink("program", "PGMDelete", "programID=$program->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn' title='{$this->lang->program->PGMDelete}'");?>
 
           <?php else:?>
           <?php if($program->status == 'wait' || $program->status == 'suspended') common::printIcon('program', 'PRJStart', "projectID=$program->id", $program, 'list', 'play', '', 'iframe', true);?>
@@ -93,7 +93,7 @@
             <ul class='dropdown-menu pull-right text-center' role='menu'>
               <?php common::printIcon('program', 'PRJManageProducts', "projectID=$program->id", $program, 'list', 'menu-project');?>
               <?php common::printIcon('program', 'PRJWhitelist',      "projectID=$program->id", $program, 'list', 'group');?>
-              <?php if(common::hasPriv('program','PRJDelete')) echo html::a($this->createLink("program", "prjdelete", "projectID=$program->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn' title='{$this->lang->program->PRJDelete}'");?>
+              <?php if(common::hasPriv('program','PRJDelete')) echo html::a($this->createLink("program", "PRJDelete", "projectID=$program->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn' title='{$this->lang->program->PRJDelete}'");?>
             </ul>
           </div>
           <?php endif;?>