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

Merge branch 'sprint/174_hufangzhou_45079' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/174_hufangzhou_45079

Browse Source
This commit is contained in:
hufangzhou
2021-12-01 17:09:56 +08:00
parent 36fa35d3d1 985599a98a
commit 7d59199f52
2 changed files with 22 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/model.php
+21 -42
View File
@@ -902,64 +902,43 @@ class productModel extends model
$product = ($this->app->tab == 'project' and empty($productID)) ? $products : array($productID => $products[$productID]);
$this->config->product->search['params']['product']['values'] = $product + array('all' => $this->lang->product->allProduct);
/* Get module of all products. */
$module = $this->loadModel('tree')->getOptionMenu($productID, 'story', 0, $branch);
if($this->app->tab == 'project' and $productID)
/* Get modules. */
$modules = $this->loadModel('tree')->getOptionMenu($productID, 'story', 0, $branch);
if($this->app->tab == 'project')
{
$module = array();
$modules = array();
$branchList = $this->loadModel('branch')->getPairs($productID, '', $this->session->project);
$modules[$productID] = $this->tree->getOptionMenu($productID, 'story', 0, array_keys($branchList));
foreach($modules as $branchList)
if($productID)
{
foreach($branchList as $branchID => $moduleList)
{
foreach($moduleList as $moduleID => $moduleName) $module[$moduleID] = $moduleName;
}
$modules = array();
$branchList = $this->loadModel('branch')->getPairs($productID, '', $this->session->project);
$branchModuleList = $this->tree->getOptionMenu($productID, 'story', 0, array_keys($branchList));
foreach($branchModuleList as $branchID => $branchModules) $modules += $branchModules;
}
}
if(!$productID)
{
$module = array();
$modules = array();
if($this->app->tab == 'project')
else
{
$moduleList = array();
$modules = array('' => '/');
$branchGroup = $this->loadModel('execution')->getBranchByProduct(array_keys($products), $this->session->project);
foreach($products as $productID => $productName)
{
if(isset($branchGroup[$productID]))
{
$branches = array_keys($branchGroup[$productID]);
$modules = $this->tree->getOptionMenu($productID, 'story', 0, $branches);
foreach($modules as $branchID => $moduleList)
{
foreach($moduleList as $moduleID => $moduleName)
{
$modules[$moduleID] = $productName . $moduleName;
}
}
$branchModuleList = $this->tree->getOptionMenu($productID, 'story', 0, array_keys($branchGroup[$productID]));
foreach($branchModuleList as $branchID => $branchModules) $moduleList += $branchModules;
}
else
{
//$modules[$productID] = $this->tree->getOptionMenu($productID, 'story', 0, $branch);
$moduleList = $this->tree->getOptionMenu($productID, 'story', 0, $branch);
}
foreach($moduleList as $moduleID => $moduleName)
{
if(empty($moduleID)) continue;
$modules[$moduleID] = $productName . $moduleName;
}
}
//foreach($modules as $branchList)
//{
// foreach($branchList as $branchID => $moduleList)
// {
// foreach($moduleList as $moduleID => $moduleName) $module[$moduleID] = $moduleName;
// }
//}
}
foreach($products as $id => $product) $module += $this->loadModel('tree')->getOptionMenu($id, 'story', 0);
}
$this->config->product->search['params']['module']['values'] = $module;
$this->config->product->search['params']['module']['values'] = $modules;
$productInfo = $this->getById($productID);
if(!$productID or $productInfo->type == 'normal' or $this->app->tab == 'assetlib')
module/story/model.php
+1 -1
View File
@@ -2491,7 +2491,7 @@ class storyModel extends model
{
$storyQuery = str_replace($allBranch, '1', $storyQuery);
}
elseif($branch)
elseif($branch !== 'all')
{
if($branch and strpos($storyQuery, '`branch` =') === false) $storyQuery .= " AND `branch` in($branch)";
}