From f062b695798c0123e9e35c042cddcb2d18e9af75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E9=87=91=E5=8B=87?= Date: Tue, 13 Jun 2023 10:55:27 +0000 Subject: [PATCH] * Fix moduleMenu. --- module/datatable/control.php | 3 ++- module/product/ui/browse.html.php | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/module/datatable/control.php b/module/datatable/control.php index ab2784e7b9..a9b29c599a 100644 --- a/module/datatable/control.php +++ b/module/datatable/control.php @@ -56,7 +56,8 @@ class datatable extends control $account = $this->app->user->account; if($account == 'guest') return $this->send(array('result' => 'fail', 'target' => $target, 'message' => 'guest.')); - if($this->post->allModule !== false) $this->setting->setItem("$account.execution.task.allModule", $this->post->allModule); + $this->loadModel('setting'); + if($this->post->allModule !== false) $this->setting->setItem("$account.execution.task.allModule", $this->post->allModule); if($this->post->showBranch !== false) $this->setting->setItem($account . '.' . $this->post->currentModule . '.' . $this->post->currentMethod . '.showBranch', $this->post->showBranch); if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => 'dao error.')); diff --git a/module/product/ui/browse.html.php b/module/product/ui/browse.html.php index 5ab995df16..1b6d46f05c 100644 --- a/module/product/ui/browse.html.php +++ b/module/product/ui/browse.html.php @@ -24,9 +24,10 @@ $fnGenerateSideBar = function() use ($moduleTree, $moduleID) ( moduleMenu(set(array ( - 'modules' => $moduleTree, - 'activeKey' => $moduleID, - 'closeLink' => createLink('execution', 'task') + 'modules' => $moduleTree, + 'activeKey' => $moduleID, + 'settingLink' => $this->createLink('tree', 'browse', "rootID=$productID&view=story¤tModuleID=0&branch=$branchID"), + 'closeLink' => createLink('execution', 'task') ))) ); };