Merge branch ztflow-sunguangming-dev/bug-63254#sunguangming of zentao/zentaopms (#9462)
This commit is contained in:
@@ -90,15 +90,16 @@ foreach($executions as $execution) $execution->nameCol = $execution->name;
|
||||
$productItems = array();
|
||||
foreach($productList as $key => $value) $productItems[] = array('text' => $value, 'active' => $key == $productID, 'url' => createLink('project', 'execution', "status={$status}&projectID={$projectID}&orderBy={$orderBy}&productID={$key}"));
|
||||
|
||||
$productName = !empty($product) ? $product->name : '';
|
||||
$showProduct = (in_array($project->model, array('waterfall', 'waterfallplus', 'ipd')) && $project->stageBy == 'product') || in_array($project->model, array('agileplus', 'scrum'));
|
||||
$productName = !empty($product) ? $product->name : '';
|
||||
$showProduct = (in_array($project->model, array('waterfall', 'waterfallplus', 'ipd')) && $project->stageBy == 'product') || in_array($project->model, array('agileplus', 'scrum'));
|
||||
$productLabel = $productName ? $productName : $lang->product->all;
|
||||
featureBar
|
||||
(
|
||||
($showProduct && $project->hasProduct && empty($project->isTpl)) ? to::leading
|
||||
(
|
||||
dropdown
|
||||
(
|
||||
to('trigger', btn($productName ? $productName : $lang->product->all, setClass('ghost'))),
|
||||
to('trigger', btn($productLabel, setClass('ghost'))),
|
||||
set::items($productItems)
|
||||
)
|
||||
) : null,
|
||||
|
||||
Reference in New Issue
Block a user