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 @@
?>
- customMenu['featurebar'] as $type => $featurebar):?>
-
-
-
-
inlink('browse', "productID=$productID&branch=$branch&browseType=bySearch¶m=$queryID"), $featurebar['link']);?>
+ moduleName, $this->methodName) as $menuItem):?>
+ hidden) continue;?>
+ name, 'QUERY') === 0):?>
+ name, 5);?>
+
- inlink('browse', "productID=$productID&branch=$branch&browseType=$type"), $featurebar['link']);?>
+
product->searchStory;?>
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);
?>
- customMenu['featurebar'] as $type => $featurebar):?>
+ moduleName, $this->methodName) as $menuItem):?>
hidden) continue;
+ $type = $menuItem->name;
if(strpos($type, 'QUERY') === 0)
{
$queryID = (int)substr($type, 5);
- echo "" . html::a(inlink('task', "project=$projectID&type=bySearch¶m=$queryID"), $featurebar['link']) . '' ;
+ echo "" . html::a(inlink('task', "project=$projectID&type=bySearch¶m=$queryID"), $menuItem->text) . '' ;
}
elseif($type != 'status')
{
- echo "" . html::a(inlink('task', "project=$projectID&type=$type"), $featurebar['link']) . '' ;
+ echo "" . html::a(inlink('task', "project=$projectID&type=$type"), $menuItem->text) . '' ;
}
elseif($type == 'status')
{
echo "";
$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 . " ", '', "data-toggle='dropdown'");
echo "';
- echo ""; common::printLink('product', 'kanban', "projectID=$projectID", $lang->project->kanban) . '';
+ echo ""; common::printLink('project', 'kanban', "projectID=$projectID", $lang->project->kanban) . '';
if($project->type == 'sprint' or $project->type == 'waterfall') echo ""; common::printLink('project', 'burn', "project=$projectID", $lang->project->burn); echo '';
echo ""; common::printLink('project', 'tree', "projectID=$projectID", $lang->project->tree); echo '';
echo "";
$groupBy = isset($groupBy) ? $groupBy : '';
$current = zget($lang->project->groups, isset($groupBy) ? $groupBy : '', '');
- if(empty($current)) $current = $featurebar['link'];
echo html::a('javascript:;', $current . " ", '', "data-toggle='dropdown'");
echo "