From a1df161747871cec534199d1edf13371626385ab Mon Sep 17 00:00:00 2001
From: wangyuting2 <851424971@qq.com>
Date: Thu, 27 Oct 2022 06:45:09 +0000
Subject: [PATCH] * Finish task #73818.

---
 framework/router.class.php       |  4 ++--
 module/common/lang/menu.php      | 10 ++++++----
 module/common/model.php          |  4 +++-
 module/custom/view/flow.html.php |  2 --
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/framework/router.class.php b/framework/router.class.php
index a67798c536..bdcc4a29dc 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -205,7 +205,7 @@ class router extends baseRouter
         /* Record system mode. */
         $config->systemMode = $mode;
 
-        $config->disabledFeatures = $disabledFeatures . $closedFeatures;
+        $config->disabledFeatures = $disabledFeatures . ',' . $closedFeatures;
 
         /* Record system score.*/
         $config->systemScore = $score;
@@ -226,7 +226,7 @@ class router extends baseRouter
 
         /* User preference init. */
         $config->URSR          = $URSR;
-        $config->URAndSR       = ($URAndSR and strpos(",{$disabledFeatures},", ',productURStory,') === false);
+        $config->URAndSR       = ($URAndSR and strpos(",{$config->disabledFeatures},", ',productURStory,') === false);
         $config->programLink   = 'program-browse';
         $config->productLink   = 'product-all';
         $config->projectLink   = 'project-browse';
diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index 3723044c2a..a80b985f1f 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -170,12 +170,12 @@ $lang->product->menu->story       = array('link' => "$lang->SRCommon|product|bro
 $lang->product->menu->plan        = array('link' => "{$lang->productplan->shortCommon}|productplan|browse|productID=%s", 'subModule' => 'productplan,bug');
 $lang->product->menu->project     = array('link' => "{$lang->project->common}|product|project|status=all&productID=%s");
 $lang->product->menu->release     = array('link' => "{$lang->release->common}|release|browse|productID=%s", 'subModule' => 'release');
-$lang->product->menu->requirement = array('link' => "$lang->URCommon|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
+$lang->product->menu->roadmap     = array('link' => "{$lang->roadmap}|product|roadmap|productID=%s");
+$lang->product->menu->requirement = array('link' => "{$lang->URCommon}|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
+$lang->product->menu->track       = array('link' => "{$lang->track}|product|track|productID=%s");
 $lang->product->menu->doc         = array('link' => "{$lang->doc->common}|doc|tableContents|type=product&objectID=%s", 'subModule' => 'doc');
 $lang->product->menu->dynamic     = array('link' => "{$lang->dynamic}|product|dynamic|productID=%s");
 $lang->product->menu->settings    = array('link' => "{$lang->settings}|product|view|productID=%s", 'subModule' => 'tree,branch', 'alias' => 'edit,whitelist,addwhitelist');
-if($hasProductRoadmap) $lang->product->menu->roadmap = array('link' => "{$lang->roadmap}|product|roadmap|productID=%s");
-if($hasProductTrack)   $lang->product->menu->track   = array('link' => "{$lang->track}|product|track|productID=%s");
 
 /* Product menu order. */
 $lang->product->menuOrder[5]  = 'dashboard';
@@ -192,7 +192,9 @@ $lang->product->menuOrder[55] = 'settings';
 $lang->product->menuOrder[60] = 'create';
 $lang->product->menuOrder[65] = 'all';
 
-if(!$config->URAndSR) unset($lang->product->menu->requirement, $lang->product->menuOrder[35]);
+if(!$hasProductRoadmap) unset($lang->product->menu->roadmap,     $lang->product->menuOrder[30]);
+if(!$config->URAndSR)   unset($lang->product->menu->requirement, $lang->product->menuOrder[35]);
+if(!$hasProductTrack)   unset($lang->product->menu->track,       $lang->product->menuOrder[40]);
 
 $lang->product->menu->doc['subMenu'] = new stdclass();
 
diff --git a/module/common/model.php b/module/common/model.php
index 9d2afaf375..1c693632e7 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -335,8 +335,10 @@ class commonModel extends model
         $this->config->personal = isset($config[$account]) ? $config[$account] : array();
 
         /* Overide the items defined in config/config.php and config/my.php. */
-        if(isset($this->config->system->common)) $this->app->mergeConfig($this->config->system->common, 'common');
+        if(isset($this->config->system->common))   $this->app->mergeConfig($this->config->system->common, 'common');
         if(isset($this->config->personal->common)) $this->app->mergeConfig($this->config->personal->common, 'common');
+
+        $this->config->disabledFeatures = $this->config->disabledFeatures . ',' . $this->config->closedFeatures;
     }
 
     /**
diff --git a/module/custom/view/flow.html.php b/module/custom/view/flow.html.php
index 0f4b49fcee..7ec10eb36a 100644
--- a/module/custom/view/flow.html.php
+++ b/module/custom/view/flow.html.php
@@ -33,7 +33,6 @@
             <div class="checkbox"> <?php echo html::radio('sprintConcept', $lang->custom->sprintConceptList, zget($this->config->custom, 'sprintConcept', '0'))?> </div>
           </div>
         </li>
-
         <?php if(strpos(",{$this->config->disabledFeatures},", ',productURStory,') === false):?>
         <li>
           <div class="form-group">
@@ -42,7 +41,6 @@
           </div>
         </li>
         <?php endif;?>
-
         <?php if($this->config->edition != 'max'):?>
         <li>
           <div class="form-group">