Merge branch 'master_xieqiyu_30891' into 'master'

* Fix bug#30891. See merge request easycorp/zentaopms!6576
2022-12-16 05:06:37 +00:00
parent 9a6929062a f17dbd2c68
commit dc33dd6283
3 changed files with 3 additions and 3 deletions
@@ -390,7 +390,7 @@ class tree extends control
        }
        else
        {
-            $this->view->optionMenu = $this->tree->getOptionMenu($module->root, $module->type, 0, $module->branch, 'noMainBranch');
+            $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');