* merge from 15.0.beta3.

2021-06-05 13:01:53 +08:00
parent 7ff5ccae12
commit 769e6b433b
220 changed files with 2661 additions and 1370 deletions
@@ -371,8 +371,9 @@ class tree extends control
    {
        if(!empty($_POST))
        {
-            $this->tree->manageChild($rootID, $viewType);
+            $moduleIDList = $this->tree->manageChild($rootID, $viewType);

+            if($this->viewType == 'json') $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'idList' => $moduleIDList));
            if($viewType == 'doc' and isonlybody()) die(js::reload('parent.parent'));
            if(isonlybody()) die(js::closeModal('parent.parent', '', "function(){parent.parent.$('a.refresh').click()}"));