diff --git a/module/execution/control.php b/module/execution/control.php index d3e55078a0..b405dfdaa6 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -40,7 +40,7 @@ class execution extends control $this->loadModel('project'); - if(!in_array($this->methodName, array('computeburn', 'ajaxgetdropmenu'))) + if(!in_array($this->methodName, array('computeburn', 'ajaxgetdropmenu')) and $this->app->openApp == 'execution') { $this->executions = $this->execution->getPairs(0, 'all', 'nocode'); if(!$this->executions and $this->methodName != 'index' and $this->methodName != 'create' and $this->app->getViewType() != 'mhtml') $this->locate($this->createLink('execution', 'create')); @@ -936,7 +936,7 @@ class execution extends control $cases = $this->loadModel('testcase')->getExecutionCases($executionID, $orderBy, $pager, $type); $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'testcase', false); - $cases = $this->testcase->appendData($cases, 'run'); + $cases = $this->testcase->appendData($cases, 'case'); $this->view->title = $this->lang->execution->testcase; $this->view->executionID = $executionID; diff --git a/module/execution/view/testcase.html.php b/module/execution/view/testcase.html.php index b3ef464618..76228dcd54 100644 --- a/module/execution/view/testcase.html.php +++ b/module/execution/view/testcase.html.php @@ -60,14 +60,14 @@ product&branch=$case->branch&extra=caseID=$caseID,version=$case->version,runID=$runID", $case, 'list', 'bug', '', '', '', '', '', $case->project); + common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$caseID,version=$case->version,runID=$runID,executionID=$executionID", $case, 'list', 'bug', '', 'iframe', '', "data-width='90%'", '', $case->project); common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase¶m=$caseID", $case, 'list', 'copy', '', '', '', '', '', $case->project); common::printIcon('testtask', 'runCase', "runID=$runID&caseID=$caseID&version=$case->version", '', 'list', 'play', '', 'iframe', true, "data-width='95%'", '', $case->project); common::printIcon('testtask', 'results', "runID=$runID&caseID=$caseID", '', 'list', 'list-alt', '', 'iframe', true, "data-width='95%'", '', $case->project); common::printIcon('testcase', 'edit', "caseID=$caseID", $case, 'list', 'edit', '', '', '', '', '', $case->project); } ?> - + diff --git a/module/story/control.php b/module/story/control.php index 70759ad1da..f77e688200 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -897,7 +897,7 @@ class story extends control } elseif($from == 'project') { - $this->loadModel('project')->setMenu($param); + if(!isonlybody()) $this->loadModel('project')->setMenu($param); } elseif($from == 'qa') { diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index 8d3282d80e..5470965242 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -489,7 +489,7 @@ id $case->title'>" . html::a($this->createLink('testcase', 'view', "caseID=$case->id", '', true), "[C] #$case->id $case->title", '', "class='iframe' data-width='80%'") . ''; + echo "