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

* Fix bug #34176.

Browse Source
This commit is contained in:
tianshujie
2023-04-14 10:01:52 +08:00
parent 079d9b1d5d
commit 4e07580434
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/tree/control.php
+6 -1
View File
@@ -401,7 +401,12 @@ class tree extends control
$this->view->optionMenu = $this->tree->getOptionMenu($module->root, $module->type, 0, $module->branch, 'noMainBranch|nodeleted');
}
if($type == 'doc') $this->view->libs = $this->loadModel('doc')->getLibs('all', $extra = 'withObject', '', 0, 'book');
if($type == 'doc')
{
$docLib = $this->loadModel('doc')->getLibById($module->root);
$objectID = isset($docLib->{$docLib->type}) ? $docLib->{$docLib->type} : 0;
$this->view->libs = $this->doc->getLibs($docLib->type, '', '', $objectID, 'book');
}
$this->view->module = $module;
$this->view->type = $type;
module/tree/model.php
+2 -1
View File
@@ -1838,7 +1838,7 @@ class treeModel extends model
if($self)
{
$self->parent = $module->parent;
if($self->root) $module->root = $self->root;
if($self->root and !isset($module->root)) $module->root = $self->root;
}
$repeatName = $this->checkUnique($self, array("id{$self->id}" => $module->name), array("id{$self->id}" => $module->branch));
@@ -1927,6 +1927,7 @@ class treeModel extends model
$this->dao->update(TABLE_STORY)->set('product')->eq($newRoot)->where('module')->in($childIdList)->exec();
$this->dao->update(TABLE_BUG)->set('product')->eq($newRoot)->where('module')->in($childIdList)->exec();
$this->dao->update(TABLE_CASE)->set('product')->eq($newRoot)->where('module')->in($childIdList)->exec();
$this->dao->update(TABLE_DOC)->set('lib')->eq($newRoot)->where('module')->in($childIdList)->exec();
if($type != 'story') return;