From f17dbd2c68e0afab15278787c68e43137f89b178 Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Fri, 16 Dec 2022 11:01:03 +0800 Subject: [PATCH] * Fix bug#30861. --- module/tree/control.php | 2 +- module/tree/view/edit.html.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/tree/control.php b/module/tree/control.php index dc5c7d5285..0da550e752 100644 --- a/module/tree/control.php +++ b/module/tree/control.php @@ -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'); diff --git a/module/tree/view/edit.html.php b/module/tree/view/edit.html.php index ab7acc3ce7..7b014e9ed7 100644 --- a/module/tree/view/edit.html.php +++ b/module/tree/view/edit.html.php @@ -189,7 +189,7 @@ function loadModules(branch) if(typeof(branchID) == 'undefined') branchID = 0; if(typeof(moduleID) == 'undefined') moduleID = 0; - link = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + productID + '&viewtype=' + type + '&branch=' + branchID + '&rootModuleID=0&returnType=html&fieldID=&needManage=true&extra=excludeModuleID=' + id;?> + ',noMainBranch¤tModuleID=' + moduleID); + link = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + productID + '&viewtype=' + type + '&branch=' + branchID + '&rootModuleID=0&returnType=html&fieldID=&needManage=true&extra=excludeModuleID=' + id;?> + ',noMainBranch,nodeleted¤tModuleID=' + moduleID); $(moduleBox).load(link, function() { $(this).children('select').attr('id', 'parent').attr('name', 'parent');