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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
Catouse
2018-05-15 09:16:18 +08:00
parent e7665d12d1 7ebb2919e3
commit 01e3a22c70
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/control.php
+1 -1
View File
@@ -259,7 +259,7 @@ class testtask extends control
$task = $this->testtask->getById($taskID);
if(!$task) die(js::error($this->lang->notFound) . js::locate('back'));
$productID = $task->product;
$this->testtask->setMenu($this->products, $productID, $task->branch);
$this->testtask->setMenu($this->products, $productID, $task->branch, $taskID);
setcookie('preProductID', $productID, $this->config->cookieLife, $this->config->webRoot);
if($this->cookie->preProductID != $productID)
module/testtask/model.php
+21 -4
View File
@@ -21,11 +21,25 @@ class testtaskModel extends model
* @access public
* @return void
*/
public function setMenu($products, $productID, $branch = 0)
public function setMenu($products, $productID, $branch = 0, $testtask = 0)
{
$this->loadModel('product')->setMenu($products, $productID, $branch);
$selectHtml = $this->product->select($products, $productID, 'testtask', 'browse', '', $branch);
if($testtask)
{
$testtasks = $this->getProductTasks($productID, $branch, 'id_desc', null, array('local', 'totalStatus'));
$selectHtml .= "<div class='btn-group angle-btn'>";
$selectHtml .= "<div class='btn-group'>";
$selectHtml .= "<a data-toggle='dropdown' class='btn'>" . $testtasks[$testtask]->name . " <span class='caret'></span></a>";
$selectHtml .= "<ul class='dropdown-menu'>";
foreach($testtasks as $testtask) $selectHtml .= '<li>' . html::a(helper::createLink('testtask', 'cases', "taskID=$testtask->id"), "<i class='icon icon-file-o'></i> {$testtask->name}") . '</li>';
$selectHtml .= "</ul>";
$selectHtml .= "</div>";
$selectHtml .= "</div>";
}
$this->app->loadLang('qa');
$productIndex = '<div class="btn-group angle-btn"><div class="btn-group">' . html::a(helper::createLink('qa', 'index', 'locate=no'), $this->lang->qa->index, '', "class='btn'") . '</div></div>';
$productIndex .= $selectHtml;
@@ -1204,7 +1218,8 @@ class testtaskModel extends model
if(!helper::isZeroDate($run->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($run->lastRunDate));
break;
case 'lastRunResult':
if($run->lastRunResult) echo $this->lang->testcase->resultList[$run->lastRunResult];
$lastRunResult = $run->lastRunResult ? $this->lang->testcase->resultList[$run->lastRunResult] : '';
echo html::a(helper::createLink('testtask', 'results', "id=$run->id", '', true), "<i class='icon icon-list-alt'></i> <span>{$lastRunResult}</span>", '', "class='iframe btn btn-icon-left'");
break;
case 'story':
if($run->story and $run->storyTitle) echo html::a(helper::createLink('story', 'view', "storyID=$run->story"), $run->storyTitle);
@@ -1223,8 +1238,11 @@ class testtaskModel extends model
echo $run->stepNumber;
break;
case 'actions':
echo "<div class='more'>";
common::printIcon('testcase', 'createBug', "product=$run->product&branch=$run->branch&extra=projectID=$task->project,buildID=$task->build,caseID=$run->case,version=$run->version,runID=$run->id,testtask=$task->id", $run, 'list', 'bug', '', 'iframe', '', "data-width='90%'");
echo "</div>";
common::printIcon('testtask', 'runCase', "id=$run->id", $run, 'list', '', '', 'runCase iframe', false, "data-width='95%'");
common::printIcon('testtask', 'results', "id=$run->id", $run, 'list', '', '', 'iframe', '', "data-width='90%'");
if(common::hasPriv('testtask', 'unlinkCase', $run))
{
@@ -1232,7 +1250,6 @@ class testtaskModel extends model
echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"casesForm\",confirmUnlink)", '<i class="icon-unlink"></i>', '', "title='{$this->lang->testtask->unlinkCase}' class='btn'");
}
common::printIcon('testcase', 'createBug', "product=$run->product&branch=$run->branch&extra=projectID=$task->project,buildID=$task->build,caseID=$run->case,version=$run->version,runID=$run->id,testtask=$task->id", $run, 'list', 'bug', '', 'iframe', '', "data-width='90%'");
break;
}
echo '</td>';
module/testtask/view/cases.html.php
-1
View File
@@ -39,7 +39,6 @@
if(!$useDatatable) include '../../common/view/tablesorter.html.php';
$this->config->testcase->datatable->defaultField = $this->config->testtask->datatable->defaultField;
$this->config->testcase->datatable->fieldList['actions']['width'] = '156';
$setting = $this->datatable->getSetting('testtask');
$widths = $this->datatable->setFixedFieldWidth($setting);