From 97ba541261a1c1128193fac6cfa2fc57bc73c599 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Thu, 25 Feb 2021 15:02:22 +0800
Subject: [PATCH] * Finish task #36042.

---
 db/update15.0.sql                  | 13 ++++++++++++-
 module/custom/view/header.html.php |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/db/update15.0.sql b/db/update15.0.sql
index 124204cbbb..38589e5355 100644
--- a/db/update15.0.sql
+++ b/db/update15.0.sql
@@ -210,6 +210,7 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (1,  'my',           'uploadAvatar'),
 (1,  'user',         'execution'),
 (1,  'user',         'cropAvatar'),
+(1,  'program',      'PRJBrowse'),
 (1,  'program',      'PRJView'),
 (1,  'search',       'index'),
 (1,  'search',       'buildIndex'),
@@ -223,6 +224,7 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (2,  'user',         'execution'),
 (2,  'user',         'cropAvatar'),
 (2,  'search',       'index'),
+(2,  'program',      'PRJBrowse'),
 (3,  'product',      'dashboard'),
 (3,  'product',      'manageLine'),
 (3,  'projectstory', 'story'),
@@ -233,6 +235,7 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (3,  'user',         'execution'),
 (3,  'user',         'cropAvatar'),
 (3,  'search',       'index'),
+(3,  'program',      'PRJBrowse'),
 (4,  'product',      'dashboard'),
 (4,  'product',      'manageLine'),
 (4,  'projectstory', 'story'),
@@ -243,6 +246,7 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (4,  'user',         'execution'),
 (4,  'user',         'cropAvatar'),
 (4,  'program',      'PRJView'),
+(4,  'program',      'PRJBrowse'),
 (4,  'search',       'index'),
 (5,  'product',      'dashboard'),
 (5,  'product',      'manageLine'),
@@ -256,6 +260,7 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (5,  'user',         'execution'),
 (5,  'user',         'cropAvatar'),
 (5,  'program',      'PRJView'),
+(5,  'program',      'PRJBrowse'),
 (5,  'search',       'index'),
 (6,  'product',      'dashboard'),
 (6,  'product',      'manageLine'),
@@ -267,6 +272,7 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (6,  'user',         'execution'),
 (6,  'user',         'cropAvatar'),
 (6,  'program',      'PRJView'),
+(6,  'program',      'PRJBrowse'),
 (6,  'search',       'index'),
 (7,  'product',      'dashboard'),
 (7,  'product',      'manageLine'),
@@ -280,6 +286,7 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (7,  'user',         'execution'),
 (7,  'user',         'cropAvatar'),
 (7,  'program',      'PRJView'),
+(7,  'program',      'PRJBrowse'),
 (7,  'search',       'index'),
 (8,  'product',      'dashboard'),
 (8,  'product',      'manageLine'),
@@ -291,6 +298,7 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (8,  'user',         'execution'),
 (8,  'user',         'cropAvatar'),
 (8,  'program',      'PRJView'),
+(8,  'program',      'PRJBrowse'),
 (8,  'search',       'index'),
 (9,  'product',      'dashboard'),
 (9,  'product',      'manageLine'),
@@ -304,6 +312,7 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (9,  'user',         'execution'),
 (9,  'user',         'cropAvatar'),
 (9,  'program',      'PRJView'),
+(9,  'program',      'PRJBrowse'),
 (9,  'search',       'index'),
 (10, 'product',      'dashboard'),
 (10, 'product',      'manageLine'),
@@ -314,7 +323,8 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (10, 'my',           'uploadAvatar'),
 (10, 'user',         'execution'),
 (10, 'user',         'cropAvatar'),
-(10,  'search',       'index'),
+(10, 'search',       'index'),
+(10, 'program',      'PRJBrowse'),
 (11, 'product',      'dashboard'),
 (11, 'product',      'manageLine'),
 (11, 'projectstory', 'story'),
@@ -323,6 +333,7 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (11, 'my',           'preference'),
 (11, 'my',           'uploadAvatar'),
 (11, 'user',         'execution'),
+(11, 'program',      'PRJBrowse'),
 (11, 'user',         'cropAvatar');
 
 INSERT INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`) VALUES
diff --git a/module/custom/view/header.html.php b/module/custom/view/header.html.php
index f889854e67..0b7a3e3da2 100644
--- a/module/custom/view/header.html.php
+++ b/module/custom/view/header.html.php
@@ -12,7 +12,7 @@
   {
       common::printLink('custom', $sysObject, "", "<span class='text'>{$lang->custom->$sysObject}</span>", '', "class='btn btn-link' id='{$sysObject}Tab'");
   }
-  if(isset($config->systemMode) and $config->systemMode == 'old')
+  if((isset($config->systemMode) and $config->systemMode == 'old') || (isset($config->global->upgradeStep) and $config->global->upgradeStep == 'mergeProgram'))
   {
       common::printLink('custom', 'mode', "", "<span class='text'>{$lang->custom->mode}</span>", '', "class='btn btn-link' id='modeTab'");
   }