From f818396a252be53305db00cd822855cfe2dcee8e Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Tue, 9 Mar 2021 10:39:52 +0800
Subject: [PATCH] * Fix bug.

---
 module/common/model.php    | 27 +++++++++++++++++----------
 module/project/control.php |  1 +
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index 864194139f..7a3e937e6d 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -452,13 +452,13 @@ class commonModel extends model
     }
 
     /**
-     * Init submenu for program menu.
+     * Init submenu for project menu.
      *
      * @static
      * @access public
      * @return array
      */
-    public static function initProgramSubmenu()
+    public static function initProjectSubmenu()
     {
         global $lang, $app;
         $moduleName = $app->getModuleName();
@@ -2369,7 +2369,14 @@ EOD;
         }
         if($group == 'project')
         {
-            $lang->menu = $config->systemMode == 'new' ? self::getProgramMainMenu($moduleName) : $lang->project->menu;
+            if($config->systemMode == 'classic' or $methodName == 'browse')
+            {
+                $lang->menu = $lang->project->menu;
+            }
+            else
+            {
+                $lang->menu = self::getProjectMainMenu($moduleName);
+            }
         }
     }
 
@@ -2409,21 +2416,21 @@ EOD;
     }
 
     /**
-     * Get program main menu by model.
+     * Get project main menu by model.
      *
      * @param  string $moduleName
      * @static
      * @access public
      * @return string
      */
-    public static function getProgramMainMenu($moduleName)
+    public static function getProjectMainMenu($moduleName)
     {
         global $app, $lang, $dbh, $config;
-        $program = $dbh->query("SELECT * FROM " . TABLE_PROGRAM . " WHERE `id` = '{$app->session->project}'")->fetch();
-        if(empty($program)) return;
+        $project = $dbh->query("SELECT * FROM " . TABLE_PROJECT . " WHERE `id` = '{$app->session->project}'")->fetch();
+        if(empty($project)) return;
 
-        self::initProgramSubmenu();
-        if($program->model == 'scrum')
+        self::initProjectSubmenu();
+        if($project->model == 'scrum')
         {
             $lang->menuOrder = $lang->scrum->menuOrder;
 
@@ -2432,7 +2439,7 @@ EOD;
             return self::processMenuVars($lang->menu->scrum);
         }
 
-        if($program->model == 'waterfall')
+        if($project->model == 'waterfall')
         {
             $lang->project->dividerMenu = str_replace(',project,', ',', $lang->project->dividerMenu);
             $lang->release->menu        = new stdclass();
diff --git a/module/project/control.php b/module/project/control.php
index 7fc081e506..0841012818 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -198,6 +198,7 @@ class project extends control
      */
     public function browse($programID = 0, $browseType = 'doing', $param = 0, $orderBy = 'order_desc', $recTotal = 0, $recPerPage = 15, $pageID = 1)
     {
+        $this->lang->noMenuModule[] = 'project';
         if($this->session->moreProjectLink) $this->lang->project->mainMenuAction = html::a($this->session->moreProjectLink, '<i class="icon icon-back"></i> ' . $this->lang->goback, '', "class='btn btn-link'");
         $this->app->session->set('projectBrowse', $this->app->getURI(true));
         $this->loadModel('datatable');