From c5dd73abccb1a3f2fe544e2d5acee869a4c50905 Mon Sep 17 00:00:00 2001
From: chentao <chentao@easycorp.ltd>
Date: Wed, 10 May 2023 16:17:02 +0800
Subject: [PATCH] * product: fix sonar alerts.

---
 module/product/control.php | 10 ++++++----
 module/product/model.php   |  2 +-
 module/product/zen.php     |  2 +-
 module/program/model.php   |  4 +++-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/module/product/control.php b/module/product/control.php
index f3b7e69469..c85298f059 100755
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -465,10 +465,12 @@ class product extends control
         $param     = (int)$param;
 
         $this->loadModel('action');
+
+        /* Save env data. */
         $this->productZen->saveBackUriSession4Dynamic();
         $this->product->setMenu($productID, 0, $type);
 
-        /* Append id for secend sort. */
+        /* Generate order by string. */
         $orderBy = $direction == 'next' ? 'date_desc' : 'date_asc';
 
         /* Get user account. */
@@ -750,7 +752,7 @@ class product extends control
         $this->product->setMenu($productID, 0);
         $this->lang->modulePageNav = '';
 
-        echo $this->fetch('personnel', 'whitelist', "objectID=$productID&module=product&browseType=$objectType&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
+        echo $this->fetch('personnel', 'whitelist', "objectID=$productID&module=$module&browseType=$objectType&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
     }
 
     /**
@@ -968,7 +970,7 @@ class product extends control
         if($projectID) $project = $this->loadModel('project')->getById($projectID);
         $mode .= ($from == 'bugToTask' or empty($this->config->CRExecution)) ? 'noclosed' : '';
         $mode .= !$projectID ? ',multiple' : '';
-        $executions = $from == 'showImport' ? $this->product->getAllExecutionPairsByProduct($productID, $branch, $projectID) : $this->product->getExecutionPairsByProduct($productID, $branch, 'id_desc', $projectID, $mode);
+        $executions = $from == 'showImport' ? $this->product->getAllExecutionPairsByProduct($productID, $branch, $projectID) : $this->product->getExecutionPairsByProduct($productID, $branch, $projectID, $mode);
         if($this->app->getViewType() == 'json') return print(json_encode($executions));
 
         if($number === '')
@@ -999,7 +1001,7 @@ class product extends control
     public function ajaxGetExecutionsByProject($productID, $projectID = 0, $branch = 0, $number = 0)
     {
         $noMultipleExecutionID = $projectID ? $this->loadModel('execution')->getNoMultipleID($projectID) : '';
-        $executions            = $this->product->getExecutionPairsByProduct($productID, $branch, 'id_desc', $projectID, 'multiple,stagefilter');
+        $executions            = $this->product->getExecutionPairsByProduct($productID, $branch, $projectID, 'multiple,stagefilter');
 
         $disabled = $noMultipleExecutionID ? "disabled='disabled'" : '';
         $html = html::select("executions[{$number}]", array('' => '') + $executions, 0, "class='form-control' onchange='loadExecutionBuilds($productID, this.value, $number)' $disabled");
diff --git a/module/product/model.php b/module/product/model.php
index 51629128a1..9830e3382a 100755
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -1058,7 +1058,7 @@ class productModel extends model
      * @access public
      * @return array
      */
-    public function getExecutionPairsByProduct($productID, $branch = 0, $orderBy = 'id_asc', $projectID = 0, $mode = '')
+    public function getExecutionPairsByProduct($productID, $branch = 0, $projectID = 0, $mode = '')
     {
         if(empty($productID)) return array();
 
diff --git a/module/product/zen.php b/module/product/zen.php
index 4e12b0e5a4..6b7cb44cdf 100644
--- a/module/product/zen.php
+++ b/module/product/zen.php
@@ -1500,7 +1500,7 @@ class productZen extends product
         /* Build parameters. */
         $pager  = new pager($recTotal, 50, 1);
         $period = $type == 'account' ? 'all'  : $type;
-        $date   = empty($date) ? '' : date('Y-m-d', empty($date) ? null : (int)$date);
+        $date   = empty($date) ? '' : date('Y-m-d', (int)$date);
 
         $actions = $this->loadModel('action')->getDynamic($account, $period, $orderBy, $pager, $productID, 'all', 'all', $date, $direction);
 
diff --git a/module/program/model.php b/module/program/model.php
index 61234a2d5d..592e0285b5 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -1781,7 +1781,9 @@ class programModel extends model
                 $actionsMap[] = $item;
             }
 
-            if($canSuspendProgram or ($canCloseProgram and $program->status != 'doing') or ($canActivateProgram and $program->status != 'closed'))
+            $canCloseCurrentProgram    = $canCloseProgram && $program->status != 'doing';
+            $canActivateCurrentProgram = $canActivateProgram && $program->status != 'closed';
+            if($canSuspendProgram or $canCloseCurrentProgram or $canActivateCurrentProgram)
             {
                 $other = new stdclass();
                 $other->name  = 'other';