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

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source 
Conflicts:
	module/search/view/buildform.html.php
This commit is contained in:
xia0ta0
2014-08-20 10:54:50 +08:00
parent 86adf69f6e 337a05fa65
commit 41c3ffae4f
32 changed files with 100 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/tree/control.php
-15
View File
@@ -180,21 +180,6 @@ class tree extends control
}
$module = $this->tree->getById($moduleID);
if($module->owner == null and $module->root != 0)
{
$module->owner = $this->loadModel('product')->getById($module->root)->QD;
}
if($type == 'task')
{
$optionMenu = $this->tree->getTaskOptionMenu($module->root);
unset($optionMenu[0]);
$this->view->optionMenu = $optionMenu;
}
else
{
$this->view->optionMenu = $this->tree->getOptionMenu($module->root, $module->type);
}
$this->view->module = $module;
$this->view->type = $type;
$this->view->users = $this->loadModel('user')->getPairs('noclosed|nodeleted', $module->owner);