Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'mayue_optimize_code' into 'master'

Browse Source 
* Handling PHP compatibility issues.

See merge request easycorp/zentaopms!2536
This commit is contained in:
李玉春
2022-03-25 03:06:59 +00:00
parent 016fef8ec6 71d64d8e65
commit 31c97d51c6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/model.php
+2 -2
View File
@@ -282,7 +282,7 @@ class productModel extends model
{
if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getProductPairs();
if(!empty($append) and is_array($append)) $append = implode($append, ',');
if(!empty($append) and is_array($append)) $append = implode(',', $append);
$views = empty($append) ? $this->app->user->view->products : $this->app->user->view->products . ",$append";
$orderBy = !empty($this->config->product->orderBy) ? $this->config->product->orderBy : 'isClosed';
@@ -358,7 +358,7 @@ class productModel extends model
return $this->loadModel('tutorial')->getExecutionProducts();
}
if(!empty($append) and is_array($append)) $append = implode($append, ',');
if(!empty($append) and is_array($append)) $append = implode(',', $append);
$views = empty($append) ? $this->app->user->view->products : $this->app->user->view->products . ",$append";
$projectProducts = $this->dao->select('t1.branch, t1.plan, t2.*')
module/program/model.php
+1 -1
View File
@@ -81,7 +81,7 @@ class programModel extends model
}
/* When mode equals assign and programID equals 0, you can query the standalone product. */
if(!empty($append) and is_array($append)) $append = implode($append, ',');
if(!empty($append) and is_array($append)) $append = implode(',', $append);
$views = empty($append) ? $this->app->user->view->products : $this->app->user->view->products . ",$append";
$products = $this->dao->select('*')->from(TABLE_PRODUCT)