From ea00c2b3934f69aa0e07569feee9aa6388b82790 Mon Sep 17 00:00:00 2001
From: hufangzhou <746775970@qq.com>
Date: Mon, 8 Mar 2021 09:36:36 +0800
Subject: [PATCH] * Adjust the code.

---
 module/common/lang/zh-cn.php | 4 ++--
 module/common/model.php      | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index e8b371e308..1a87df1c16 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -162,8 +162,8 @@ $lang->dividerMenu = ',qa,report,admin,';
 /* Program set menu. */
 $lang->program = new stdclass();
 $lang->program->menu = new stdclass();
-//$lang->program->menu->index   = '主页|program|index|';
-$lang->program->menu->browse  = array('link' => '项目集|program|browse|');
+//$lang->program->menu->index  = '主页|program|index|';
+$lang->program->menu->browse = array('link' => '项目集|program|browse|');
 
 $lang->project = new stdclass();
 $lang->project->menu = new stdclass();
diff --git a/module/common/model.php b/module/common/model.php
index 140f330b86..ef5ffd6fd3 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -1723,7 +1723,7 @@ EOD;
         {
             $this->app->user = $this->session->user;
 
-            $inProject = (isset($this->lang->navGroup->$module) && $this->lang->navGroup->$module == 'project') || ($module == 'program' && $method == 'index');
+            $inProject = (isset($this->lang->navGroup->$module) && $this->lang->navGroup->$module == 'project');
             if(!defined('IN_UPGRADE') and $inProject)
             {
                 /* Check program priv. */
@@ -1767,7 +1767,6 @@ EOD;
 
         /* If is the program admin, have all program privs. */
         $inProject = isset($lang->navGroup->$module) && $lang->navGroup->$module == 'project';
-        if($module == 'program' && strpos($method, 'project') !== false) $inProject = true;
         if($inProject && $app->session->project && strpos(",{$app->user->rights['projects']},", ",{$app->session->project},") !== false) return true;
 
         /* If not super admin, check the rights. */