Merge branch 'sprint/zentaopms262_mayue_bug#29958' into 'master'

* Fix bug #29958.

See merge request easycorp/zentaopms!6275
This commit is contained in:
孙广明
2022-11-22 02:19:26 +00:00
3 changed files with 12 additions and 5 deletions
+1 -1
View File
@@ -53,7 +53,7 @@ function processKanbanData(key, programsData)
/* unclosed products */
var productID = product.id;
var productItem = {id: 'product-' + productID, _id: productID, name: product.name};
var productItem = {id: 'product-' + productID, _id: productID, name: product.name, shadow: product.shadow};
items.unclosedProduct = [productItem];
/* plans */
+7 -2
View File
@@ -274,7 +274,7 @@ class programModel extends model
$involvedPrograms = $this->getInvolvedPrograms($this->app->user->account);
/* Get all products under programs. */
$productGroup = $this->dao->select('id, program, name')->from(TABLE_PRODUCT)
$productGroup = $this->dao->select('id, program, name, shadow')->from(TABLE_PRODUCT)
->where('deleted')->eq(0)
->andWhere('program')->in(array_keys($programs))
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->products)->fi()
@@ -285,7 +285,12 @@ class programModel extends model
$productPairs = array();
foreach($productGroup as $programID => $products)
{
foreach($products as $product) $productPairs[$product->id] = $product->id;
foreach($products as $product)
{
$productPairs[$product->id] = $product->id;
if($product->shadow) $product->name = $product->name . ' (' . $this->lang->project->common . ')';
}
}
/* Get all plans under products. */