From 42a26d17deac8dae9ce9cdc54f7b504c945742bb Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Wed, 20 Apr 2016 15:29:12 +0800
Subject: [PATCH]  * fix feature menu.

---
 module/product/view/browse.html.php      | 12 ++++++------
 module/project/view/task.html.php        | 11 ++++++-----
 module/project/view/taskheader.html.php  |  3 +--
 module/testcase/view/caseheader.html.php |  9 +++++----
 module/testtask/view/caseheader.html.php |  9 +++++----
 5 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 5a9fe6dcec..1348983bb8 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -28,13 +28,13 @@
         ?>
       </span>
     </li>
-    <?php foreach($app->customMenu['featurebar'] as $type => $featurebar):?>
-    <?php if($featurebar['status'] == 'hide') continue;?>
-    <?php if(strpos($type, 'QUERY') === 0):?>
-    <?php $queryID = (int)substr($type, 5);?>
-    <li id='<?php echo $type?>Tab'><?php echo html::a($this->inlink('browse', "productID=$productID&branch=$branch&browseType=bySearch&param=$queryID"), $featurebar['link']);?></li>
+    <?php foreach(customModel::getFeatureMenu($this->moduleName, $this->methodName) as $menuItem):?>
+    <?php if($menuItem->hidden) continue;?>
+    <?php if(strpos($menuItem->name, 'QUERY') === 0):?>
+    <?php $queryID = (int)substr($menuItem->name, 5);?>
+    <li id='<?php echo $menuItem->name?>Tab'><?php echo html::a($this->inlink('browse', "productID=$productID&branch=$branch&browseType=bySearch&param=$queryID"), $menuItem->text);?></li>
     <?php else:?>
-    <li id='<?php echo $type?>Tab'><?php echo html::a($this->inlink('browse', "productID=$productID&branch=$branch&browseType=$type"), $featurebar['link']);?></li>
+    <li id='<?php echo $menuItem->name?>Tab'><?php echo html::a($this->inlink('browse', "productID=$productID&branch=$branch&browseType=$menuItem->name"), $menuItem->text);?></li>
     <?php endif;?>
     <?php endforeach;?>
     <li id='bysearchTab'><a href='javascript:;'><i class='icon-search icon'></i> <?php echo $lang->product->searchStory;?></a></li>
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index 223c1b292b..6e4d9e6f47 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -46,24 +46,25 @@ js::set('browseType', $browseType);
         ?>
       </span>
     </li>
-    <?php foreach($app->customMenu['featurebar'] as $type => $featurebar):?>
+    <?php foreach(customModel::getFeatureMenu($this->moduleName, $this->methodName) as $menuItem):?>
     <?php
-    if($featurebar['status'] == 'hide') continue;
+    if($menuItem->hidden) continue;
+    $type = $menuItem->name;
     if(strpos($type, 'QUERY') === 0)
     {
         $queryID = (int)substr($type, 5);
-        echo "<li id='{$type}Tab'>" . html::a(inlink('task', "project=$projectID&type=bySearch&param=$queryID"), $featurebar['link']) . '</li>' ;
+        echo "<li id='{$type}Tab'>" . html::a(inlink('task', "project=$projectID&type=bySearch&param=$queryID"), $menuItem->text) . '</li>' ;
     }
     elseif($type != 'status')
     {
-        echo "<li id='{$type}Tab'>" . html::a(inlink('task', "project=$projectID&type=$type"), $featurebar['link']) . '</li>' ;
+        echo "<li id='{$type}Tab'>" . html::a(inlink('task', "project=$projectID&type=$type"), $menuItem->text) . '</li>' ;
     }
     elseif($type == 'status')
     {
         echo "<li id='statusTab' class='dropdown'>";
         $taskBrowseType = isset($status) ? $this->session->taskBrowseType : '';
         $current        = zget($lang->project->statusSelects, $taskBrowseType, '');
-        if(empty($current)) $current = $featurebar['link'];
+        if(empty($current)) $current = $menuItem->text;
         echo html::a('javascript:;', $current . " <span class='caret'></span>", '', "data-toggle='dropdown'");
         echo "<ul class='dropdown-menu'>";
         foreach ($lang->project->statusSelects as $key => $value)
diff --git a/module/project/view/taskheader.html.php b/module/project/view/taskheader.html.php
index e65997adc8..4e7470119c 100644
--- a/module/project/view/taskheader.html.php
+++ b/module/project/view/taskheader.html.php
@@ -2,13 +2,12 @@
   <ul class='nav'>
     <?php
     echo "<li id='listTab'>"; common::printLink('project', 'task', "project=$projectID&type=unclosed", $lang->project->list); echo '</li>';
-    echo "<li id='kanbanTab'>"; common::printLink('product', 'kanban', "projectID=$projectID", $lang->project->kanban) . '</li>';
+    echo "<li id='kanbanTab'>"; common::printLink('project', 'kanban', "projectID=$projectID", $lang->project->kanban) . '</li>';
     if($project->type == 'sprint' or $project->type == 'waterfall') echo "<li id='burnTab'>"; common::printLink('project', 'burn', "project=$projectID", $lang->project->burn); echo '</li>';
     echo "<li id='treeTab'>"; common::printLink('project', 'tree', "projectID=$projectID", $lang->project->tree); echo '</li>';
     echo "<li id='groupTab' class='dropdown'>";
     $groupBy = isset($groupBy) ? $groupBy : '';
     $current = zget($lang->project->groups, isset($groupBy) ? $groupBy : '', '');
-    if(empty($current)) $current = $featurebar['link'];
     echo html::a('javascript:;', $current . " <span class='caret'></span>", '', "data-toggle='dropdown'");
     echo "<ul class='dropdown-menu'>";
     foreach ($lang->project->groups as $key => $value)
diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php
index c95601d3b1..ef209d8d42 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -19,17 +19,18 @@
     $hasGroupPriv  = common::hasPriv('testcase', 'groupcase');
     $hasZeroPriv   = common::hasPriv('story', 'zerocase');
     ?>
-    <?php foreach($app->customMenu['featurebar'] as $type => $featurebar):?>
-    <?php if($featurebar['status'] == 'hide') continue;?>
+    <?php foreach(customModel::getFeatureMenu($this->moduleName, $this->methodName) as $menuItem):?>
     <?php
+    if($menuItem->hidden) continue;
+    $type = $menuItem->name;
     if($hasBrowsePriv and strpos($type, 'QUERY') === 0)
     {
         $queryID = (int)substr($type, 5);
-        echo "<li id='{$type}Tab'>" . html::a($this->createLink('testcase', 'browse', "productid=$productID&branch=$branch&browseType=bySearch&param=$queryID"), $featurebar['link']) . "</li>";
+        echo "<li id='{$type}Tab'>" . html::a($this->createLink('testcase', 'browse', "productid=$productID&branch=$branch&browseType=bySearch&param=$queryID"), $menuItem->text) . "</li>";
     }
     elseif($hasBrowsePriv and ($type == 'all' or $type == 'needconfirm'))
     {
-        echo "<li id='{$type}Tab'>" . html::a($this->createLink('testcase', 'browse', "productid=$productID&branch=$branch&browseType=$type"), $featurebar['link']) . "</li>";
+        echo "<li id='{$type}Tab'>" . html::a($this->createLink('testcase', 'browse', "productid=$productID&branch=$branch&browseType=$type"), $menuItem->text) . "</li>";
     }
     elseif($hasGroupPriv and $type == 'group')
     {
diff --git a/module/testtask/view/caseheader.html.php b/module/testtask/view/caseheader.html.php
index 39c7646ea3..c8d67da7b0 100644
--- a/module/testtask/view/caseheader.html.php
+++ b/module/testtask/view/caseheader.html.php
@@ -20,17 +20,18 @@
     $hasCasesPriv = common::hasPriv('testtask', 'cases');
     $hasGroupPriv = common::hasPriv('testtask', 'groupcase');
     ?>
-    <?php foreach($app->customMenu['featurebar'] as $type => $featurebar):?>
-    <?php if($featurebar['status'] == 'hide') continue;?>
+    <?php foreach(customModel::getFeatureMenu($this->moduleName, $this->methodName) as $menuItem):?>
     <?php
+    if($menuItem->hidden) continue;
+    $type = $menuItem->name;
     if($hasCasesPriv and strpos($type, 'QUERY') === 0)
     {
         $queryID = (int)substr($type, 5);
-        echo "<li id='{$type}Tab'>" . html::a($this->inlink('cases', "taskID=$taskID&browseType=bySearch&param=$queryID"), $featurebar['link']) . "</li>";
+        echo "<li id='{$type}Tab'>" . html::a($this->inlink('cases', "taskID=$taskID&browseType=bySearch&param=$queryID"), $menuItem->text) . "</li>";
     }
     elseif($hasCasesPriv and ($type == 'all' or $type == 'assignedtome'))
     {
-        echo "<li id='{$type}Tab'>" . html::a($this->inlink('cases', "taskID=$taskID&browseType=$type&param=0"), $featurebar['link']) . "</li>";
+        echo "<li id='{$type}Tab'>" . html::a($this->inlink('cases', "taskID=$taskID&browseType=$type&param=0"), $menuItem->text) . "</li>";
     }
     elseif($hasGroupPriv and $type == 'group')
     {