diff --git a/module/common/model.php b/module/common/model.php index 3b9876795b..9ce8e55520 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -3104,7 +3104,7 @@ EOD; return; } - if($currentModule == $tab && $currentMethod== 'create') + if($currentModule == $tab && $currentMethod == 'create') { $lang->menu = $lang->$tab->homeMenu; return; @@ -3128,6 +3128,12 @@ EOD; $lang->menu = $lang->$tab->homeMenu; return; } + + if(isset($menu['subModule']) and strpos(",{$menu['subModule']},", ",$currentModule,") !== false) + { + $lang->menu = $lang->$tab->homeMenu; + return; + } } /* Default, display menu. */ diff --git a/module/message/control.php b/module/message/control.php index e154581939..07660d0e82 100644 --- a/module/message/control.php +++ b/module/message/control.php @@ -142,7 +142,7 @@ class message extends control else { echo << +
{$messages}
diff --git a/module/project/control.php b/module/project/control.php index 086cb652b2..4d96af5f2e 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -710,8 +710,6 @@ class project extends control return print(js::locate($this->session->projectList, 'parent')); } - if($this->app->tab == 'program') $this->loadModel('program')->setMenu(0); - if(!$this->post->projectIdList) return print(js::locate($this->session->projectList, 'parent')); $projectIdList = $this->post->projectIdList; $projects = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->in($projectIdList)->fetchAll('id');