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

* fix for check module unique.

Browse Source
This commit is contained in:
wangyidong
2016-05-23 09:21:26 +08:00
parent 16f8c28202
commit d17beaf08c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/tree/model.php
+2 -1
View File
@@ -1419,10 +1419,11 @@ class treeModel extends model
public function checkUnique($rootID, $viewType, $parentModuleID, $modules = array(), $branches = array())
{
if(empty($branches)) $branches = $this->post->branch;
$branches = array_unique($branches);
if($this->isMergeModule($rootID, $viewType)) $viewType .= ',story';
$existsModules = $this->dao->select('id,branch,name')->from(TABLE_MODULE)->where('root')->eq($rootID)->andWhere('type')->in($viewType)->andWhere('parent')->eq($parentModuleID)->fetchAll();
$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)->fetchAll();
$repeatName = '';
foreach($modules as $id => $name)
{