From 3fc6835beac186d9a768d968f1f9b3b2d2c97576 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 21 Feb 2023 02:44:47 +0000
Subject: [PATCH] * Fix bug of task #85038.

---
 module/stage/model.php             | 6 ++++++
 module/stage/view/browse.html.php  | 9 ---------
 module/stage/view/settype.html.php | 9 ---------
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/module/stage/model.php b/module/stage/model.php
index e5ad79e754..78e1ce28c6 100644
--- a/module/stage/model.php
+++ b/module/stage/model.php
@@ -203,10 +203,16 @@ class stageModel extends model
         if($type == 'waterfall')
         {
             $this->lang->admin->menuList->model['subMenu']['waterfallplus']['exclude'] .= ",{$moduleName}-{$methodName}";
+            unset($this->lang->admin->menuList->model['subMenu']['scrum']['subModule']);
+            unset($this->lang->admin->menuList->model['subMenu']['scrumplus']['subModule']);
+            unset($this->lang->admin->menuList->model['subMenu']['waterfallplus']['subModule']);
         }
         if($type == 'waterfallplus')
         {
             $this->lang->admin->menuList->model['subMenu']['waterfall']['exclude'] .= ",{$moduleName}-{$methodName}";
+            unset($this->lang->admin->menuList->model['subMenu']['scrum']['subModule']);
+            unset($this->lang->admin->menuList->model['subMenu']['waterfall']['subModule']);
+            unset($this->lang->admin->menuList->model['subMenu']['scrumplus']['subModule']);
         }
     }
 }
diff --git a/module/stage/view/browse.html.php b/module/stage/view/browse.html.php
index 2a5aeb0da2..32d8a50a9c 100644
--- a/module/stage/view/browse.html.php
+++ b/module/stage/view/browse.html.php
@@ -22,15 +22,6 @@
     </p>
   </div>
   <?php else:?>
-  <div class='side-col'>
-    <div class='panel'>
-      <div class='panel-body'>
-        <div class="list-group">
-          <?php echo html::a(inlink('browse', "orderBy=id_asc&type={$type}"), $lang->stage->browse, '', "class='selected'");?>
-        </div>
-      </div>
-    </div>
-  </div>
   <div class='main-col main-content main-table' style='padding: 0;padding-top: 20px;'>
     <div id="mainMenu" class="clearfix" style='padding:0px 10px'>
       <div class="pull-left" style='padding-top:5px'>
diff --git a/module/stage/view/settype.html.php b/module/stage/view/settype.html.php
index 0546bd890f..86f5e6fb03 100644
--- a/module/stage/view/settype.html.php
+++ b/module/stage/view/settype.html.php
@@ -29,15 +29,6 @@ EOT;
 ?>
 <?php js::set('itemRow', $itemRow)?>
 <div id='mainContent' class='main-row'>
-  <div class='side-col'>
-    <div class='panel'>
-      <div class='panel-body'>
-        <div class="list-group">
-          <?php echo html::a(inlink('setType'), $lang->stage->setType, '', "class='selected'");?>
-        </div>
-      </div>
-    </div>
-  </div>
   <div class='main-col main-content'>
     <form class="load-indicator main-form form-ajax" method='post'>
       <table class='table table-form active-disabled table-condensed mw-600px'>