From 62cdfe21985db70c9b477cb7ac47400f0fb7f8c8 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Thu, 5 Aug 2021 13:25:34 +0800 Subject: [PATCH] * Fix bug #14049. --- module/doc/control.php | 6 ++++-- module/execution/control.php | 4 ++++ module/product/control.php | 2 ++ module/project/control.php | 2 ++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/module/doc/control.php b/module/doc/control.php index 0fd59e4825..58b07227a7 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -318,8 +318,9 @@ class doc extends control { $this->app->rawMethod = $objectType; unset($this->lang->doc->menu->product['subMenu']); - if($this->config->systemMode == 'new') unset($this->lang->doc->menu->project['subMenu']); unset($this->lang->doc->menu->custom['subMenu']); + if($this->config->systemMode == 'new') unset($this->lang->doc->menu->project['subMenu']); + if($this->config->systemMode == 'classic') unset($this->lang->doc->menu->execution['subMenu']); } $lib = $this->doc->getLibByID($libID); @@ -422,8 +423,9 @@ class doc extends control $this->app->rawMethod = $objectType; unset($this->lang->doc->menu->product['subMenu']); - if($this->config->systemMode == 'new') unset($this->lang->doc->menu->project['subMenu']); unset($this->lang->doc->menu->custom['subMenu']); + if($this->config->systemMode == 'new') unset($this->lang->doc->menu->project['subMenu']); + if($this->config->systemMode == 'classic') unset($this->lang->doc->menu->execution['subMenu']); /* High light menu. */ if(strpos(',product,project,execution,custom,book,', ",$objectType,") !== false) diff --git a/module/execution/control.php b/module/execution/control.php index eaf395ea53..0d0cb3c83d 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -1220,6 +1220,10 @@ class execution extends control if($this->config->systemMode == 'new') $selectedExecutionID = key($this->executions); $this->execution->setMenu($selectedExecutionID); } + elseif($this->app->openApp == 'doc') + { + unset($this->lang->doc->menu->execution['subMenu']); + } $this->app->loadLang('program'); $this->app->loadLang('stage'); diff --git a/module/product/control.php b/module/product/control.php index 71a5dcfcae..d99757534c 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -362,6 +362,8 @@ class product extends control if($programID) $lines = array('') + $this->product->getLinePairs($programID); if($this->config->systemMode == 'classic') $lines = array('') + $this->product->getLinePairs(); + if($this->app->openApp == 'doc') unset($this->lang->doc->menu->product['subMenu']); + $this->view->title = $this->lang->product->create; $this->view->position[] = $this->view->title; $this->view->groups = $this->loadModel('group')->getPairs(); diff --git a/module/project/control.php b/module/project/control.php index 29c2257158..3bb58b5208 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -373,6 +373,8 @@ class project extends control } } + if($this->app->openApp == 'doc') unset($this->lang->doc->menu->project['subMenu']); + $this->view->title = $this->lang->project->create; $this->view->position[] = $this->lang->project->create;