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

* Finish task #72201,72130,72129.

Browse Source
This commit is contained in:
tanghucheng
2022-10-18 15:04:35 +08:00
parent e32b0bf2ff
commit ccd017af47
8 changed files with 68 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/tree/model.php
+9 -3
View File
@@ -80,7 +80,10 @@ class treeModel extends model
$startModule = $this->getById($startModule);
if($startModule) $startModulePath = $startModule->path . '%';
}
if($type == 'feedback' and strpos($param, 'noproduct') === false) $type = 'story,' . $type;
/* If feedback module is merge add story module.*/
$syncConfig = json_decode($this->config->global->syncProductFeedback, true);
if($type == 'feedback' and strpos($param, 'noproduct') === false and isset($syncConfig[$rootID])) $type = 'story,' . $type;
if($this->isMergeModule($rootID, $type))
{
return $this->dao->select('*')->from(TABLE_MODULE)
@@ -1378,10 +1381,13 @@ class treeModel extends model
{
if($type == 'line') $rootID = 0;
$syncConfig = json_decode($this->config->global->syncProductFeedback, true);
if($type == 'feedback' and isset($syncConfig[$rootID])) $type = "$type,story";
/* if createVersion <= 4.1 or type == 'story', only get modules of its type. */
if(!$this->isMergeModule($rootID, $type) or $type == 'story')
{
if($type == 'feedback') $type = "$type,story";
return $this->dao->select('*')->from(TABLE_MODULE)
->where('root')->eq((int)$rootID)
->andWhere('parent')->eq((int)$moduleID)
@@ -1397,7 +1403,7 @@ class treeModel extends model
}
/* else get modules of its type and story type. */
if(strpos('task|case|bug|feedback', $type) !== false) $type = "$type,story";
if(strpos('task|case|bug', $type) !== false) $type = "$type,story";
return $this->dao->select('*')->from(TABLE_MODULE)
->where('root')->eq((int)$rootID)