diff --git a/module/testtask/control.php b/module/testtask/control.php index b58ea0f8e8..df588ad8cf 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -317,13 +317,14 @@ class testtask extends control $this->view->position[] = $this->lang->testtask->common; $this->view->position[] = $this->lang->testtask->view; - $this->view->productID = $productID; - $this->view->task = $task; - $this->view->users = $this->loadModel('user')->getPairs('noclosed|noletter'); - $this->view->actions = $this->loadModel('action')->getList('testtask', $taskID); - $this->view->build = $build; - $this->view->stories = $stories; - $this->view->bugs = $bugs; + $this->view->productID = $productID; + $this->view->task = $task; + $this->view->users = $this->loadModel('user')->getPairs('noclosed|noletter'); + $this->view->actions = $this->loadModel('action')->getList('testtask', $taskID); + $this->view->build = $build; + $this->view->testreportTitle = $this->dao->select('title')->from(TABLE_TESTREPORT)->where('id')->eq($task->testreport)->fetch('title'); + $this->view->stories = $stories; + $this->view->bugs = $bugs; $this->display(); } @@ -742,14 +743,16 @@ class testtask extends control $this->view->position[] = $this->lang->testtask->edit; /* Create testtask from testtask of test.*/ - $productID = $productID ? $productID : key($this->products); - $projectID = $this->lang->navGroup->testtask == 'qa' ? 0 : $this->session->project; - $executions = empty($productID) ? array() : $this->product->getExecutionPairsByProduct($productID, 0, 'id_desc', $projectID); - $builds = empty($productID) ? array() : $this->loadModel('build')->getProductBuildPairs($productID, 0, 'notrunk', true); + $productID = $productID ? $productID : key($this->products); + $projectID = $this->lang->navGroup->testtask == 'qa' ? 0 : $this->session->project; + $executions = empty($productID) ? array() : $this->product->getExecutionPairsByProduct($productID, 0, 'id_desc', $projectID); + $builds = empty($productID) ? array() : $this->loadModel('build')->getProductBuildPairs($productID, 0, 'notrunk', true); + $testreports = $this->dao->select('id,title')->from(TABLE_TESTREPORT)->where('builds')->like('%' . $task->build . '%')->fetchPairs('id','title'); $this->view->task = $task; $this->view->executions = $executions; $this->view->builds = $builds; + $this->view->testreports = $testreports; $this->view->users = $this->loadModel('user')->getPairs('nodeleted', $task->owner); $this->view->contactLists = $this->user->getContactLists($this->app->user->account, 'withnote'); diff --git a/module/testtask/view/edit.html.php b/module/testtask/view/edit.html.php index 9eeaad1b15..888e3ae0c3 100644 --- a/module/testtask/view/edit.html.php +++ b/module/testtask/view/edit.html.php @@ -25,7 +25,7 @@
- + - + @@ -67,6 +67,10 @@ + + + + diff --git a/module/testtask/view/view.html.php b/module/testtask/view/view.html.php index a98f1d9a40..d2ef052f59 100644 --- a/module/testtask/view/view.html.php +++ b/module/testtask/view/view.html.php @@ -80,7 +80,7 @@
testtask->execution;?>testtask->execution;?> execution, "class='form-control chosen' onchange='loadExecutionRelated(this.value)'"); @@ -35,7 +35,7 @@
testtask->build;?>testtask->build;?> build, "class='form-control chosen'");?>
testtask->status;?> testtask->statusList, $task->status, "class='form-control chosen'");?>
testtask->testreport;?>testreport, "class='form-control chosen'");?>
testtask->name;?> name, "class='form-control'");?>
- + @@ -128,6 +128,10 @@ + + + +
testtask->execution;?>testtask->execution;?> executionName : html::a($this->createLink('execution', 'story', "executionID=$task->execution"), $task->executionName, '', "title='{$task->executionName}'");?>
testtask->status;?> processStatus('testtask', $task);?>
testtask->testreport;?>testreport) ? '' : html::a($this->createLink('testreport', 'view', "reportID=$task->testreport"), $testreportTitle);?>