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

* finish task #4821.

Browse Source
This commit is contained in:
wangyidong
2018-09-04 16:27:19 +08:00
parent c1ed944fd1
commit 24c982f0a7
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/tree/model.php
+11 -2
View File
@@ -1481,8 +1481,9 @@ class treeModel extends model
if($this->isMergeModule($rootID, $viewType) and $viewType != 'task') $viewType .= ',story';
$existsModules = $this->dao->select('id,branch,name')->from(TABLE_MODULE)->where('root')->eq($rootID)->andWhere('type')->in($viewType)->andWhere('parent')->eq($parentModuleID)->andWhere('branch')->in($branches)->andWhere('deleted')->eq(0)->fetchAll();
$repeatName = '';
$existsModules = $this->dao->select('id,branch,name')->from(TABLE_MODULE)->where('root')->eq($rootID)->andWhere('type')->in($viewType)->andWhere('parent')->eq($parentModuleID)->andWhere('branch')->in($branches)->andWhere('deleted')->eq(0)->fetchAll();
$checkedModules = ',';
$repeatName = '';
foreach($modules as $id => $name)
{
$existed = false;
@@ -1491,6 +1492,13 @@ class treeModel extends model
$existed = true;
$moduleID = substr($id, 2);
}
if(strpos($checkedModules, ",$name,") !== false)
{
$repeatName = $name;
break;
}
foreach($existsModules as $existsModule)
{
if($name == $existsModule->name and (!$existed or $moduleID != $existsModule->id) and (!isset($branches[$id]) or $branches[$id] == $existsModule->branch))
@@ -1499,6 +1507,7 @@ class treeModel extends model
break 2;
}
}
$checkedModules .= "$name,";
}
if($repeatName) die(js::alert(sprintf($this->lang->tree->repeatName, $repeatName)));
return true;