From 84c62782743dc510304a8063003f37bd7fd1fcc3 Mon Sep 17 00:00:00 2001
From: wangyuting2 <851424971@qq.com>
Date: Wed, 3 Aug 2022 13:32:21 +0800
Subject: [PATCH] * Finish task #63288.

---
 module/bug/view/browse.html.php               |  1 +
 module/build/lang/de.php                      |  1 -
 module/build/lang/en.php                      |  1 -
 module/build/lang/fr.php                      |  1 -
 module/build/lang/vi.php                      |  1 -
 module/build/lang/zh-cn.php                   |  3 --
 module/caselib/lang/de.php                    |  1 -
 module/caselib/lang/en.php                    |  1 -
 module/caselib/lang/fr.php                    |  1 -
 module/caselib/lang/vi.php                    |  1 -
 module/caselib/lang/zh-cn.php                 |  1 -
 module/caselib/view/browse.html.php           |  3 +-
 module/common/model.php                       | 34 +++++++++++++++++++
 module/execution/lang/de.php                  |  2 ++
 module/execution/lang/en.php                  |  2 ++
 module/execution/lang/fr.php                  |  2 ++
 module/execution/lang/vi.php                  |  2 ++
 module/execution/lang/zh-cn.php               |  2 ++
 module/execution/view/all.html.php            |  1 +
 module/execution/view/build.html.php          |  3 +-
 module/execution/view/task.html.php           |  1 +
 module/product/view/all.html.php              |  1 +
 module/productplan/view/browsebylist.html.php |  1 +
 module/program/view/browse.html.php           |  1 +
 module/project/lang/de.php                    |  2 ++
 module/project/lang/en.php                    |  2 ++
 module/project/lang/fr.php                    |  2 ++
 module/project/lang/vi.php                    |  2 ++
 module/project/lang/zh-cn.php                 |  2 ++
 module/project/view/browsebycard.html.php     |  1 +
 module/project/view/browsebylist.html.php     |  1 +
 module/project/view/build.html.php            |  3 +-
 module/release/lang/de.php                    |  1 -
 module/release/lang/en.php                    |  1 -
 module/release/lang/fr.php                    |  1 -
 module/release/lang/vi.php                    |  1 -
 module/release/lang/zh-cn.php                 |  1 -
 module/release/view/browse.html.php           |  1 +
 module/story/lang/de.php                      |  1 -
 module/story/lang/en.php                      |  1 -
 module/story/lang/fr.php                      |  1 -
 module/story/lang/vi.php                      |  1 -
 module/story/lang/zh-cn.php                   |  1 -
 module/testsuite/control.php                  |  6 ++--
 module/testsuite/lang/de.php                  |  1 -
 module/testsuite/lang/en.php                  |  1 -
 module/testsuite/lang/fr.php                  |  1 -
 module/testsuite/lang/vi.php                  |  1 -
 module/testsuite/lang/zh-cn.php               |  1 -
 module/testsuite/view/browse.html.php         |  6 ++--
 module/testtask/view/browse.html.php          |  1 +
 51 files changed, 77 insertions(+), 35 deletions(-)

diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 8774ed36d9..b3e3e81c65 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -37,6 +37,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
   </div>
   <div class="btn-toolbar pull-left">
     <?php
+    common::sortFeatureMenu();
     $menus = customModel::getFeatureMenu($this->moduleName, $this->methodName);
     foreach($menus as $menuItem)
     {
diff --git a/module/build/lang/de.php b/module/build/lang/de.php
index 57cda9034a..d714465ad7 100644
--- a/module/build/lang/de.php
+++ b/module/build/lang/de.php
@@ -69,5 +69,4 @@ $lang->build->action->buildopened = '$date, erstellt von <strong>$actor</strong>
 
 $lang->backhome = 'zurück';
 
-$lang->build->featureBar = array();
 $lang->build->featureBar['browse']['all'] = 'Build List';
diff --git a/module/build/lang/en.php b/module/build/lang/en.php
index 8b24223361..73ec7a1d33 100644
--- a/module/build/lang/en.php
+++ b/module/build/lang/en.php
@@ -69,5 +69,4 @@ $lang->build->action->buildopened = '$date, created by <strong>$actor</strong>,
 
 $lang->backhome = 'back';
 
-$lang->build->featureBar = array();
 $lang->build->featureBar['browse']['all'] = 'Build List';
diff --git a/module/build/lang/fr.php b/module/build/lang/fr.php
index 0b9e940d36..48326670ad 100644
--- a/module/build/lang/fr.php
+++ b/module/build/lang/fr.php
@@ -69,5 +69,4 @@ $lang->build->action->buildopened = '$date, Build <strong>$extra</strong> créé
 
 $lang->backhome = 'Retour';
 
-$lang->build->featureBar = array();
 $lang->build->featureBar['browse']['all'] = 'Build List';
diff --git a/module/build/lang/vi.php b/module/build/lang/vi.php
index a083e3d0cc..e0080ba5da 100644
--- a/module/build/lang/vi.php
+++ b/module/build/lang/vi.php
@@ -65,5 +65,4 @@ $lang->build->action->buildopened = '$date, được tạo bởi <strong>$actor<
 
 $lang->backhome = 'Trở lại';
 
-$lang->build->featureBar = array();
 $lang->build->featureBar['browse']['all'] = 'Build List';
diff --git a/module/build/lang/zh-cn.php b/module/build/lang/zh-cn.php
index 54c6d8456a..c45863af1a 100644
--- a/module/build/lang/zh-cn.php
+++ b/module/build/lang/zh-cn.php
@@ -68,6 +68,3 @@ $lang->build->action = new stdclass();
 $lang->build->action->buildopened = '$date, 由 <strong>$actor</strong> 创建版本 <strong>$extra</strong>。' . "\n";
 
 $lang->backhome = '返回';
-
-$lang->build->featureBar = array();
-$lang->build->featureBar['browse']['all'] = '所有版本';
diff --git a/module/caselib/lang/de.php b/module/caselib/lang/de.php
index 265cab49f9..d36368dae3 100644
--- a/module/caselib/lang/de.php
+++ b/module/caselib/lang/de.php
@@ -45,6 +45,5 @@ $lang->caselib->legendDesc = 'Description';
 $lang->caselib->libraryDelete = 'Do you want to delete this library？';
 $lang->caselib->noModule      = '<div>You have no modules.</div><div>Manage it now.</div>';
 
-$lang->caselib->featureBar = array();
 $lang->caselib->featureBar['browse']['all']  = 'All';
 $lang->caselib->featureBar['browse']['wait'] = 'Waiting';
diff --git a/module/caselib/lang/en.php b/module/caselib/lang/en.php
index 265cab49f9..d36368dae3 100644
--- a/module/caselib/lang/en.php
+++ b/module/caselib/lang/en.php
@@ -45,6 +45,5 @@ $lang->caselib->legendDesc = 'Description';
 $lang->caselib->libraryDelete = 'Do you want to delete this library？';
 $lang->caselib->noModule      = '<div>You have no modules.</div><div>Manage it now.</div>';
 
-$lang->caselib->featureBar = array();
 $lang->caselib->featureBar['browse']['all']  = 'All';
 $lang->caselib->featureBar['browse']['wait'] = 'Waiting';
diff --git a/module/caselib/lang/fr.php b/module/caselib/lang/fr.php
index c7795763d0..0b62e64e5f 100644
--- a/module/caselib/lang/fr.php
+++ b/module/caselib/lang/fr.php
@@ -45,6 +45,5 @@ $lang->caselib->legendDesc = 'Description';
 $lang->caselib->libraryDelete = 'Voulez vous supprimer cette library ？';
 $lang->caselib->noModule      = "<div>Vous n'avez aucun modules.</div><div>Gérer les modules maintenant.</div>";
 
-$lang->caselib->featureBar = array();
 $lang->caselib->featureBar['browse']['all']  = 'All';
 $lang->caselib->featureBar['browse']['wait'] = 'Waiting';
diff --git a/module/caselib/lang/vi.php b/module/caselib/lang/vi.php
index 250c6056ac..468d4ff3d9 100644
--- a/module/caselib/lang/vi.php
+++ b/module/caselib/lang/vi.php
@@ -40,6 +40,5 @@ $lang->caselib->legendDesc = 'Mô tả';
 $lang->caselib->libraryDelete = 'Bạn có muốn xóa thư viện này?';
 $lang->caselib->noModule      = '<div>Chưa có Module.</div><div>Quản lý ngay.</div>';
 
-$lang->caselib->featureBar = array();
 $lang->caselib->featureBar['browse']['all']  = 'All';
 $lang->caselib->featureBar['browse']['wait'] = 'Waiting';
diff --git a/module/caselib/lang/zh-cn.php b/module/caselib/lang/zh-cn.php
index 135381b55d..06c5ee8d67 100644
--- a/module/caselib/lang/zh-cn.php
+++ b/module/caselib/lang/zh-cn.php
@@ -45,6 +45,5 @@ $lang->caselib->legendDesc = '描述';
 $lang->caselib->libraryDelete = '您确认要删除该用例库吗？';
 $lang->caselib->noModule      = '<div>您现在还没有模块信息</div><div>请维护用例库模块</div>';
 
-$lang->caselib->featureBar = array();
 $lang->caselib->featureBar['browse']['all']  = '所有';
 $lang->caselib->featureBar['browse']['wait'] = '待评审';
diff --git a/module/caselib/view/browse.html.php b/module/caselib/view/browse.html.php
index 2183f6a916..da0d3bd499 100644
--- a/module/caselib/view/browse.html.php
+++ b/module/caselib/view/browse.html.php
@@ -40,7 +40,8 @@ js::set('flow',          $config->global->flow);
   </div>
   <div class='btn-toolbar pull-left'>
     <?php
-    if(!$config->testcase->needReview && empty($config->testcase->forceReview)) unset($lang->caselib->featureBar['wait']);
+    common::sortFeatureMenu();
+    if(!$config->testcase->needReview && empty($config->testcase->forceReview)) unset($lang->caselib->featureBar['browse']['wait']);
     foreach($lang->caselib->featureBar['browse'] as $featureType => $label)
     {
         $activeClass = $browseType == $featureType ? 'btn-active-text' : '';
diff --git a/module/common/model.php b/module/common/model.php
index 4f68d398e7..e991e7ee6d 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -3373,6 +3373,40 @@ EOD;
 
         return $Parsedown->text($markdown);
     }
+
+    /**
+     * Sort featureBar.
+     *
+     * @static
+     * @access public
+     * @return bool
+     */
+    public static function sortFeatureMenu()
+    {
+        global $lang, $app;
+
+        $module = $app->rawModule;
+        $method = $app->rawMethod;
+
+        /* It will be sorted according to the workflow in the future */
+        if(!empty($lang->featureBarSort[$module][$method]))
+        {
+            $featureBar = array();
+            if(empty($lang->$module->featureBar[$method])) return false;
+            foreach($lang->$module->featureBar[$method] as $key => $label)
+            {
+                foreach($lang->featureBarSort[$module][$method] as $currentKey => $afterKey)
+                {
+                    if($key == $currentKey) continue;
+                    $featureBar[$method][$key] = $label;
+                    if($key == $afterKey) $featureBar[$method][$currentKey] = $lang->$module->featureBar[$method][$currentKey];
+                }
+            }
+            $lang->$module->featureBar = $featureBar;
+        }
+
+        return true;
+    }
 }
 
 class common extends commonModel
diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php
index 627fb63b7f..d7b76b33d7 100644
--- a/module/execution/lang/de.php
+++ b/module/execution/lang/de.php
@@ -512,6 +512,8 @@ $lang->execution->featureBar['all']['doing']     = $lang->execution->statusList[
 $lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended'];
 $lang->execution->featureBar['all']['closed']    = $lang->execution->statusList['closed'];
 
+$lang->execution->featureBar['build']['all'] = 'Build List';
+
 $lang->execution->myExecutions = 'Ich bin beteiligt.';
 $lang->execution->doingProject = 'Laufende Projekte';
 
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index b230ea3f39..a87ac46f06 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -512,6 +512,8 @@ $lang->execution->featureBar['all']['doing']     = $lang->execution->statusList[
 $lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended'];
 $lang->execution->featureBar['all']['closed']    = $lang->execution->statusList['closed'];
 
+$lang->execution->featureBar['build']['all'] = 'Build List';
+
 $lang->execution->myExecutions = 'Mine';
 $lang->execution->doingProject = 'Ongoing Projects';
 
diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php
index bb12d7782a..df78e79283 100644
--- a/module/execution/lang/fr.php
+++ b/module/execution/lang/fr.php
@@ -512,6 +512,8 @@ $lang->execution->featureBar['all']['doing']     = $lang->execution->statusList[
 $lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended'];
 $lang->execution->featureBar['all']['closed']    = $lang->execution->statusList['closed'];
 
+$lang->execution->featureBar['build']['all'] = 'Build List';
+
 $lang->execution->myExecutions = "J'étais impliqué";
 $lang->execution->doingProject = 'Projets en cours';
 
diff --git a/module/execution/lang/vi.php b/module/execution/lang/vi.php
index c1f02f6280..242f3d7b1a 100644
--- a/module/execution/lang/vi.php
+++ b/module/execution/lang/vi.php
@@ -418,6 +418,8 @@ $lang->execution->featureBar['all']['doing']     = $lang->execution->statusList[
 $lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended'];
 $lang->execution->featureBar['all']['closed']    = $lang->execution->statusList['closed'];
 
+$lang->execution->featureBar['build']['all'] = 'Build List';
+
 $lang->execution->myExecutions = 'Tôi tham gia';
 $lang->execution->doingProject = 'Hiện trường';
 
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index 12477116d0..730eecadd9 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -512,6 +512,8 @@ $lang->execution->featureBar['all']['doing']     = $lang->execution->statusList[
 $lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended'];
 $lang->execution->featureBar['all']['closed']    = $lang->execution->statusList['closed'];
 
+$lang->execution->featureBar['build']['all'] = '所有版本';
+
 $lang->execution->myExecutions = '我参与的';
 $lang->execution->doingProject = '进行中的项目';
 
diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php
index 2cca80f2ba..512b25aae3 100644
--- a/module/execution/view/all.html.php
+++ b/module/execution/view/all.html.php
@@ -48,6 +48,7 @@ js::set('isCNLang', !$this->loadModel('common')->checkNotCN())
       </ul>
     </div>
     <?php endif;?>
+    <?php common::sortFeatureMenu();?>
     <?php foreach($lang->execution->featureBar['all'] as $key => $label):?>
     <?php $label = "<span class='text'>$label</span>";?>
     <?php if($status == $key) $label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>";?>
diff --git a/module/execution/view/build.html.php b/module/execution/view/build.html.php
index 1e54a870b6..3f2e90bc4b 100644
--- a/module/execution/view/build.html.php
+++ b/module/execution/view/build.html.php
@@ -16,7 +16,8 @@
 <div id="mainMenu" class="clearfix table-row">
   <div class="btn-toolbar pull-left">
     <?php
-    foreach($lang->build->featureBar['browse'] as $featureType => $label)
+    common::sortFeatureMenu();
+    foreach($lang->execution->featureBar['build'] as $featureType => $label)
     {
         $label       = "<span class='text'>$label</span>";
         $activeClass = $type == $featureType ? 'btn-active-text' : '';
diff --git a/module/execution/view/task.html.php b/module/execution/view/task.html.php
index aaca5d0609..6b722f4ed8 100644
--- a/module/execution/view/task.html.php
+++ b/module/execution/view/task.html.php
@@ -59,6 +59,7 @@ body {margin-bottom: 25px;}
   </div>
   <div class="btn-toolbar pull-left">
     <?php
+    common::sortFeatureMenu();
     foreach(customModel::getFeatureMenu('execution', 'task') as $menuItem)
     {
         if($execution->type == 'ops' && $menuItem->name == 'needconfirm') continue;
diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php
index 0ac5a3c677..9b7c2c1119 100644
--- a/module/product/view/all.html.php
+++ b/module/product/view/all.html.php
@@ -13,6 +13,7 @@
 <?php include '../../common/view/sortable.html.php';?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
+    <?php common::sortFeatureMenu();?>
     <?php foreach($lang->product->featureBar['all'] as $key => $label):?>
     <?php $recTotalLabel = $browseType == $key ? " <span class='label label-light label-badge'>{$recTotal}</span>" : '';?>
     <?php echo html::a(inlink("all", "browseType=$key&orderBy=$orderBy"), "<span class='text'>{$label}</span>" . $recTotalLabel, '', "class='btn btn-link' id='{$key}Tab'");?>
diff --git a/module/productplan/view/browsebylist.html.php b/module/productplan/view/browsebylist.html.php
index 453243d5bc..a046895e57 100644
--- a/module/productplan/view/browsebylist.html.php
+++ b/module/productplan/view/browsebylist.html.php
@@ -16,6 +16,7 @@
 </style>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
+    <?php common::sortFeatureMenu();?>
     <?php foreach(customModel::getFeatureMenu($this->moduleName, $this->methodName) as $menuItem):?>
     <?php if(isset($menuItem->hidden)) continue;?>
     <?php $label   = "<span class='text'>{$menuItem->text}</span>";?>
diff --git a/module/program/view/browse.html.php b/module/program/view/browse.html.php
index cd44bdd116..a259bdc4c5 100644
--- a/module/program/view/browse.html.php
+++ b/module/program/view/browse.html.php
@@ -23,6 +23,7 @@
 <?php endif;?>
 <div id='mainMenu' class='clearfix'>
   <div class="btn-toolBar pull-left">
+    <?php common::sortFeatureMenu();?>
     <?php foreach($lang->program->featureBar['browse'] as $key => $label):?>
     <?php $active = $status == $key ? 'btn-active-text' : '';?>
     <?php $label = "<span class='text'>$label</span>";?>
diff --git a/module/project/lang/de.php b/module/project/lang/de.php
index 15f2ff8af4..3c33b5d2dd 100644
--- a/module/project/lang/de.php
+++ b/module/project/lang/de.php
@@ -248,6 +248,8 @@ $lang->project->featureBar['browse']['doing']     = 'Doing';
 $lang->project->featureBar['browse']['suspended'] = 'Suspended';
 $lang->project->featureBar['browse']['closed']    = 'Closed';
 
+$lang->project->featureBar['build']['all'] = 'Build List';
+
 $lang->project->aclList['private'] = 'Private (For team members and stakeholders only)';
 $lang->project->aclList['open']    = "Open (accessible with project view permissions)";
 
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 17be8a5dcd..550055de5b 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -248,6 +248,8 @@ $lang->project->featureBar['browse']['doing']     = 'Doing';
 $lang->project->featureBar['browse']['suspended'] = 'Suspended';
 $lang->project->featureBar['browse']['closed']    = 'Closed';
 
+$lang->project->featureBar['build']['all'] = 'Build List';
+
 $lang->project->aclList['private'] = 'Private (For the project leader, team members and stakeholders only)';
 $lang->project->aclList['open']    = "Open (accessible with project view permissions)";
 
diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php
index ec5c3f96cb..3ee9ab7866 100644
--- a/module/project/lang/fr.php
+++ b/module/project/lang/fr.php
@@ -248,6 +248,8 @@ $lang->project->featureBar['browse']['doing']     = 'En Cours';
 $lang->project->featureBar['browse']['suspended'] = 'Suspendues';
 $lang->project->featureBar['browse']['closed']    = 'Fermées';
 
+$lang->project->featureBar['build']['all'] = 'Build List';
+
 $lang->project->aclList['private'] = 'Private (For team members and stakeholders only)';
 $lang->project->aclList['open']    = "Open (accessible with project view permissions)";
 
diff --git a/module/project/lang/vi.php b/module/project/lang/vi.php
index 444636c0f9..7c3bd62dcd 100644
--- a/module/project/lang/vi.php
+++ b/module/project/lang/vi.php
@@ -166,6 +166,8 @@ $lang->project->featureBar['browse']['wait']      = 'Waiting';
 $lang->project->featureBar['browse']['suspended'] = 'Suspended';
 $lang->project->featureBar['browse']['closed']    = 'Closed';
 
+$lang->project->featureBar['build']['all'] = 'Build List';
+
 $lang->project->aclList['private'] = 'Private (For team members and stakeholders only)';
 $lang->project->aclList['open']    = "Open (accessible with project view permissions)";
 
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index d69c955bd3..3e1ac80450 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -248,6 +248,8 @@ $lang->project->featureBar['browse']['doing']     = '进行中';
 $lang->project->featureBar['browse']['suspended'] = '已挂起';
 $lang->project->featureBar['browse']['closed']    = '已关闭';
 
+$lang->project->featureBar['build']['all'] = '所有版本';
+
 $lang->project->aclList['private'] = "私有 (只有项目负责人、团队成员和干系人可访问)";
 $lang->project->aclList['open']    = "公开 (有项目视图权限即可访问)";
 
diff --git a/module/project/view/browsebycard.html.php b/module/project/view/browsebycard.html.php
index 357dceac52..0794d733db 100644
--- a/module/project/view/browsebycard.html.php
+++ b/module/project/view/browsebycard.html.php
@@ -59,6 +59,7 @@
   <div class="btn-toolBar pull-left">
     <?php $excludedEmptyPrograms = array_filter($programs);?>
     <div class="input-control w-150px" id='programBox'><?php echo html::select('programID', $programs, $programID, "onchange=changeProgram(this.value) class='form-control chosen' data-placeholder='{$lang->project->selectProgram}' data-drop_width='" . (empty($excludedEmptyPrograms) ? 170 : 450) . "' data-max_drop_width='0'");?></div>
+    <?php common::sortFeatureMenu();?>
     <?php foreach($lang->project->featureBar['browse'] as $key => $label):?>
     <?php $active = $browseType == $key ? 'btn-active-text' : '';?>
     <?php $label = "<span class='text'>$label</span>";?>
diff --git a/module/project/view/browsebylist.html.php b/module/project/view/browsebylist.html.php
index 7d460d7a38..61d7450523 100644
--- a/module/project/view/browsebylist.html.php
+++ b/module/project/view/browsebylist.html.php
@@ -33,6 +33,7 @@
   </div>
   <?php endif;?>
   <div class="btn-toolBar pull-left">
+    <?php common::sortFeatureMenu();?>
     <?php foreach($lang->project->featureBar['browse'] as $key => $label):?>
     <?php $active = $browseType == $key ? 'btn-active-text' : '';?>
     <?php $label = "<span class='text'>$label</span>";?>
diff --git a/module/project/view/build.html.php b/module/project/view/build.html.php
index ce7bf3c7b9..100e689765 100644
--- a/module/project/view/build.html.php
+++ b/module/project/view/build.html.php
@@ -20,7 +20,8 @@
 <div id="mainMenu" class="clearfix table-row">
   <div class="btn-toolbar pull-left">
     <?php
-    foreach($lang->build->featureBar['browse'] as $featureType => $label)
+    common::sortFeatureMenu();
+    foreach($lang->project->featureBar['build'] as $featureType => $label)
     {
         $activeClass = $type == $featureType ? 'btn-active-text' : '';
         $label       = "<span class='text'>$label</span>";
diff --git a/module/release/lang/de.php b/module/release/lang/de.php
index ff088942e6..b89bab0f5f 100644
--- a/module/release/lang/de.php
+++ b/module/release/lang/de.php
@@ -91,7 +91,6 @@ $lang->release->notifyList['ET'] = "{$lang->execution->common} Team Members";
 $lang->release->notifyList['PT'] = "Project Team Members";
 $lang->release->notifyList['CT'] = "Copy To";
 
-$lang->release->featureBar = array();
 $lang->release->featureBar['browse']['all']       = $lang->release->all;
 $lang->release->featureBar['browse']['normal']    = $lang->release->statusList['normal'];
 $lang->release->featureBar['browse']['terminate'] = $lang->release->statusList['terminate'];
diff --git a/module/release/lang/en.php b/module/release/lang/en.php
index c6db859ba9..cb985d492a 100644
--- a/module/release/lang/en.php
+++ b/module/release/lang/en.php
@@ -91,7 +91,6 @@ $lang->release->notifyList['ET'] = "{$lang->execution->common} Team Members";
 $lang->release->notifyList['PT'] = "Project Team Members";
 $lang->release->notifyList['CT'] = "Copy To";
 
-$lang->release->featureBar = array();
 $lang->release->featureBar['browse']['all']       = $lang->release->all;
 $lang->release->featureBar['browse']['normal']    = $lang->release->statusList['normal'];
 $lang->release->featureBar['browse']['terminate'] = $lang->release->statusList['terminate'];
diff --git a/module/release/lang/fr.php b/module/release/lang/fr.php
index aa7021e2d4..73eb1dcdfd 100644
--- a/module/release/lang/fr.php
+++ b/module/release/lang/fr.php
@@ -91,7 +91,6 @@ $lang->release->notifyList['ET'] = "{$lang->execution->common} Team Members";
 $lang->release->notifyList['PT'] = "Project Team Members";
 $lang->release->notifyList['CT'] = "Copy To";
 
-$lang->release->featureBar = array();
 $lang->release->featureBar['browse']['all']       = $lang->release->all;
 $lang->release->featureBar['browse']['normal']    = $lang->release->statusList['normal'];
 $lang->release->featureBar['browse']['terminate'] = $lang->release->statusList['terminate'];
diff --git a/module/release/lang/vi.php b/module/release/lang/vi.php
index 55167422eb..4861c32caf 100644
--- a/module/release/lang/vi.php
+++ b/module/release/lang/vi.php
@@ -85,7 +85,6 @@ $lang->release->notifyList['SC'] = 'Story Creator';
 $lang->release->notifyList['ET'] = "{$lang->execution->common} Team Members";
 $lang->release->notifyList['PT'] = "Project Team Members";
 
-$lang->release->featureBar = array();
 $lang->release->featureBar['browse']['all']       = $lang->release->all;
 $lang->release->featureBar['browse']['normal']    = $lang->release->statusList['normal'];
 $lang->release->featureBar['browse']['terminate'] = $lang->release->statusList['terminate'];
diff --git a/module/release/lang/zh-cn.php b/module/release/lang/zh-cn.php
index 7df64996b2..60585a1fda 100644
--- a/module/release/lang/zh-cn.php
+++ b/module/release/lang/zh-cn.php
@@ -91,7 +91,6 @@ $lang->release->notifyList['ET'] = "所在{$lang->execution->common}团队成员
 $lang->release->notifyList['PT'] = "所在项目团队成员";
 $lang->release->notifyList['CT'] = "抄送给";
 
-$lang->release->featureBar = array();
 $lang->release->featureBar['browse']['all']       = $lang->release->all;
 $lang->release->featureBar['browse']['normal']    = $lang->release->statusList['normal'];
 $lang->release->featureBar['browse']['terminate'] = $lang->release->statusList['terminate'];
diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php
index 3a39a0265b..7bfc011a2d 100644
--- a/module/release/view/browse.html.php
+++ b/module/release/view/browse.html.php
@@ -16,6 +16,7 @@
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
   <?php 
+  common::sortFeature();
   foreach($lang->release->featureBar['browse'] as $featureType => $label)
   {
       $active = $type == $featureType ? 'btn-active-text' : '';
diff --git a/module/story/lang/de.php b/module/story/lang/de.php
index 8ec14c524d..86c87a427b 100644
--- a/module/story/lang/de.php
+++ b/module/story/lang/de.php
@@ -442,6 +442,5 @@ $lang->story->subDivideTip['planned']   = 'The Story has been planned and cannot
 $lang->story->subDivideTip['projected'] = 'The Story has been initiated and cannot be subdivided.';
 $lang->story->subDivideTip['notActive'] = 'The Story is not active and cannot be subdivided.';
 
-$lang->story->featureBar = array();
 $lang->story->featureBar['browse']['all']      = $lang->all;
 $lang->story->featureBar['browse']['unclosed'] = $lang->story->unclosed;
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index 0e866fe589..7daf10ad84 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -442,6 +442,5 @@ $lang->story->subDivideTip['planned']   = 'The Story has been planned and cannot
 $lang->story->subDivideTip['projected'] = 'The Story has been initiated and cannot be subdivided.';
 $lang->story->subDivideTip['notActive'] = 'The Story is not active and cannot be subdivided.';
 
-$lang->story->featureBar = array();
 $lang->story->featureBar['browse']['all']      = $lang->all;
 $lang->story->featureBar['browse']['unclosed'] = $lang->story->unclosed;
diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php
index 9314f4f8ba..53a9ebacea 100644
--- a/module/story/lang/fr.php
+++ b/module/story/lang/fr.php
@@ -442,6 +442,5 @@ $lang->story->subDivideTip['planned']   = 'Cette Story est planifiée et ne peut
 $lang->story->subDivideTip['projected'] = 'Cette Story a été créée et ne peut être subdivisée.';
 $lang->story->subDivideTip['notActive'] = "Cette Story n'est pas active et ne peut être subdivisée.";
 
-$lang->story->featureBar = array();
 $lang->story->featureBar['browse']['all']      = $lang->all;
 $lang->story->featureBar['browse']['unclosed'] = $lang->story->unclosed;
diff --git a/module/story/lang/vi.php b/module/story/lang/vi.php
index 35474a7d74..8cb2bb50bc 100644
--- a/module/story/lang/vi.php
+++ b/module/story/lang/vi.php
@@ -440,6 +440,5 @@ $lang->story->subDivideTip['planned']   = 'The Story has been planned and cannot
 $lang->story->subDivideTip['projected'] = 'The Story has been initiated and cannot be subdivided.';
 $lang->story->subDivideTip['notActive'] = 'The Story is not active and cannot be subdivided.';
 
-$lang->story->featureBar = array();
 $lang->story->featureBar['browse']['all']      = $lang->all;
 $lang->story->featureBar['browse']['unclosed'] = $lang->story->unclosed;
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index ca7efd094e..78117cd03d 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -442,6 +442,5 @@ $lang->story->subDivideTip['planned']   = '该需求已计划，无法进行细
 $lang->story->subDivideTip['projected'] = '该需求已立项，无法进行细分操作';
 $lang->story->subDivideTip['notActive'] = '需求不是激活状态，无法进行细分操作';
 
-$lang->story->featureBar = array();
 $lang->story->featureBar['browse']['all']      = $lang->all;
 $lang->story->featureBar['browse']['unclosed'] = $lang->story->unclosed;
diff --git a/module/testsuite/control.php b/module/testsuite/control.php
index 7f10daebfd..0c783ee535 100644
--- a/module/testsuite/control.php
+++ b/module/testsuite/control.php
@@ -50,6 +50,7 @@ class testsuite extends control
      * Browse test suites.
      *
      * @param  int    $productID
+     * @param  string $type
      * @param  string $orderBy
      * @param  int    $recTotal
      * @param  int    $recPerPage
@@ -57,7 +58,7 @@ class testsuite extends control
      * @access public
      * @return void
      */
-    public function browse($productID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function browse($productID = 0, $type = 'all', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* Save session. */
         $this->session->set('testsuiteList', $this->app->getURI(true), 'qa');
@@ -78,7 +79,7 @@ class testsuite extends control
         if(empty($suites) and $pageID > 1)
         {
             $pager  = pager::init(0, $recPerPage, 1);
-            $suites = $this->testsuite->getSuites($productID, $sort, $pager, 'all');
+            $suites = $this->testsuite->getSuites($productID, $sort, $pager, $type);
         }
 
         $this->view->title       = $productName . $this->lang->testsuite->common;
@@ -89,6 +90,7 @@ class testsuite extends control
         $this->view->productName = $productName;
         $this->view->orderBy     = $orderBy;
         $this->view->suites      = $suites;
+        $this->view->type        = $type;
         $this->view->users       = $this->loadModel('user')->getPairs('noclosed|noletter');
         $this->view->pager       = $pager;
         $this->view->product     = $this->product->getByID($productID);
diff --git a/module/testsuite/lang/de.php b/module/testsuite/lang/de.php
index c334a8622a..87f5b051b0 100644
--- a/module/testsuite/lang/de.php
+++ b/module/testsuite/lang/de.php
@@ -55,5 +55,4 @@ $lang->testsuite->lblUnlinkCase = 'Unverknüpfte Fälle';
 $lang->testsuite->authorList['private'] = 'Privat';
 $lang->testsuite->authorList['public']  = 'Öffentlich';
 
-$lang->testsuite->featureBar = array();
 $lang->testsuite->featureBar['browse']['all'] = 'Suite List';
diff --git a/module/testsuite/lang/en.php b/module/testsuite/lang/en.php
index ba76f0b92b..ad27dd4346 100644
--- a/module/testsuite/lang/en.php
+++ b/module/testsuite/lang/en.php
@@ -55,5 +55,4 @@ $lang->testsuite->lblUnlinkCase = 'Unlink Case';
 $lang->testsuite->authorList['private'] = 'Private';
 $lang->testsuite->authorList['public']  = 'Public';
 
-$lang->testsuite->featureBar = array();
 $lang->testsuite->featureBar['browse']['all'] = 'Suite List';
diff --git a/module/testsuite/lang/fr.php b/module/testsuite/lang/fr.php
index c210831d5d..40d8c6b906 100644
--- a/module/testsuite/lang/fr.php
+++ b/module/testsuite/lang/fr.php
@@ -55,5 +55,4 @@ $lang->testsuite->lblUnlinkCase = 'Retirer CasTest';
 $lang->testsuite->authorList['private'] = 'Privé';
 $lang->testsuite->authorList['public']  = 'Public';
 
-$lang->testsuite->featureBar = array();
 $lang->testsuite->featureBar['browse']['all'] = 'Suite List';
diff --git a/module/testsuite/lang/vi.php b/module/testsuite/lang/vi.php
index 265a2bd982..f262b8932f 100644
--- a/module/testsuite/lang/vi.php
+++ b/module/testsuite/lang/vi.php
@@ -52,5 +52,4 @@ $lang->testsuite->lblUnlinkCase = 'Hủy liên kết tình huống';
 $lang->testsuite->authorList['private'] = 'Riêng tư';
 $lang->testsuite->authorList['public']  = 'Công khai';
 
-$lang->testsuite->featureBar = array();
 $lang->testsuite->featureBar['browse']['all'] = 'Suite List';
diff --git a/module/testsuite/lang/zh-cn.php b/module/testsuite/lang/zh-cn.php
index 7abe9792ef..3ac13b0a20 100644
--- a/module/testsuite/lang/zh-cn.php
+++ b/module/testsuite/lang/zh-cn.php
@@ -55,5 +55,4 @@ $lang->testsuite->lblUnlinkCase = '移除用例';
 $lang->testsuite->authorList['private'] = '私有';
 $lang->testsuite->authorList['public']  = '公开';
 
-$lang->testsuite->featureBar = array();
 $lang->testsuite->featureBar['browse']['all'] = '套件列表';
diff --git a/module/testsuite/view/browse.html.php b/module/testsuite/view/browse.html.php
index a8c6f0aa20..05d7aa1291 100644
--- a/module/testsuite/view/browse.html.php
+++ b/module/testsuite/view/browse.html.php
@@ -16,13 +16,13 @@
 <div id="mainMenu" class='clearfix'>
   <div class="btn-toolbar pull-left">
     <?php
-    $type = 'all';
+    common::sortFeatureMenu();
     foreach($lang->testsuite->featureBar['browse'] as $featureType => $label)
     {
         $activeClass = $type == $featureType ? 'btn-active-text' : '';
         $label       = "<span class='text'>$label</span>";
         if($type == $featureType) $label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>";
-        echo html::a(inlink('browse', "productID=$productID"), $label, '',"class='btn btn-link $activeClass'");
+        echo html::a(inlink('browse', "productID=$productID&type=$featureType"), $label, '',"class='btn btn-link $activeClass'");
     }
     ?>
   </div>
@@ -45,7 +45,7 @@
   <?php else:?>
   <table class='table has-sort-head' id='suiteList'>
     <thead>
-    <?php $vars = "productID=$productID&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
+    <?php $vars = "productID=$productID&type=$type&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
       <tr>
         <th class='c-id text-left'><?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
         <th class='c-name text-left'><?php common::printOrderLink('name', $orderBy, $vars, $lang->testsuite->name);?></th>
diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php
index 8b6cee92ab..0a636ab293 100644
--- a/module/testtask/view/browse.html.php
+++ b/module/testtask/view/browse.html.php
@@ -34,6 +34,7 @@ $status = $this->session->testTaskVersionStatus;
         ?>
       </ul>
     </div>
+    <?php common::sortFeatureMenu();?>
     <?php foreach($lang->testtask->featureBar['browse'] as $key => $label):?>
     <?php $key = strtolower($key);?>
     <?php echo html::a(inlink('browse', "productID=$productID&branch=$branch&type=$scope,$key"), "<span class='text'>$label</span>", '', "id='{$key}Tab' class='btn btn-link'");?>