Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* fix bug #857.

Browse Source
This commit is contained in:
wangyidong
2016-06-13 16:42:48 +08:00
parent 3c8f0a4abf
commit 7f6d3b60ff
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/view/taskheader.html.php
+7 -7
View File
@@ -29,17 +29,17 @@
foreach(customModel::getFeatureMenu('project', 'task') as $menuItem)
{
if(isset($menuItem->hidden)) continue;
$type = $menuItem->name;
if(strpos($type, 'QUERY') === 0)
$menuType = $menuItem->name;
if(strpos($menuType, 'QUERY') === 0)
{
$queryID = (int)substr($type, 5);
echo "<li id='{$type}Tab'>" . html::a(inlink('task', "project=$projectID&type=bySearch&param=$queryID"), $menuItem->text) . '</li>' ;
$queryID = (int)substr($menuType, 5);
echo "<li id='{$menuType}Tab'>" . html::a(inlink('task', "project=$projectID&type=bySearch&param=$queryID"), $menuItem->text) . '</li>' ;
}
elseif($type != 'status')
elseif($menuType != 'status')
{
echo "<li id='{$type}Tab'>" . html::a(inlink('task', "project=$projectID&type=$type"), $menuItem->text) . '</li>' ;
echo "<li id='{$menuType}Tab'>" . html::a(inlink('task', "project=$projectID&type=$menuType"), $menuItem->text) . '</li>' ;
}
elseif($type == 'status')
elseif($menuType == 'status')
{
echo "<li id='statusTab' class='dropdown'>";
$taskBrowseType = isset($status) ? $this->session->taskBrowseType : '';
module/testcase/view/caseheader.html.php
+8 -8
View File
@@ -21,17 +21,17 @@
<?php foreach(customModel::getFeatureMenu('testcase', 'browse') as $menuItem):?>
<?php
if(isset($menuItem->hidden)) continue;
$type = $menuItem->name;
if($hasBrowsePriv and strpos($type, 'QUERY') === 0)
$menyType = $menuItem->name;
if($hasBrowsePriv and strpos($menyType, '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"), $menuItem->text) . "</li>";
$queryID = (int)substr($menyType, 5);
echo "<li id='{$menyType}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'))
elseif($hasBrowsePriv and ($menyType == 'all' or $menyType == 'needconfirm'))
{
echo "<li id='{$type}Tab'>" . html::a($this->createLink('testcase', 'browse', "productid=$productID&branch=$branch&browseType=$type"), $menuItem->text) . "</li>";
echo "<li id='{$menyType}Tab'>" . html::a($this->createLink('testcase', 'browse', "productid=$productID&branch=$branch&browseType=$menyType"), $menuItem->text) . "</li>";
}
elseif($hasGroupPriv and $type == 'group')
elseif($hasGroupPriv and $menyType == 'group')
{
echo "<li id='groupTab' class='dropdown'>";
$groupBy = isset($groupBy) ? $groupBy : '';
@@ -47,7 +47,7 @@
}
echo '</ul></li>';
}
elseif($hasZeroPriv and $type == 'zerocase')
elseif($hasZeroPriv and $menyType == 'zerocase')
{
echo "<li id='zerocaseTab'>" . html::a($this->createLink('story', 'zeroCase', "productID=$productID"), $lang->story->zeroCase) . '</li>';
}