diff --git a/module/bug/control.php b/module/bug/control.php index 878bbcf32d..cbb6acd20e 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -288,8 +288,6 @@ class bug extends control { if(empty($this->products)) $this->locate($this->createLink('product', 'create')); - $this->qa->setMenu($this->products, $productID); - /* Unset discarded types. */ foreach($this->config->bug->discardedTypes as $type) unset($this->lang->bug->typeList[$type]); @@ -297,7 +295,18 @@ class bug extends control $extras = str_replace(array(',', ' '), array('&', ''), $extras); parse_str($extras, $output); - if(isset($output['executionID'])) $this->loadModel('execution')->setMenu($output['executionID']); + if($this->app->openApp == 'execution') + { + $this->loadModel('execution')->setMenu($output['executionID']); + } + else if($this->app->openApp == 'project') + { + $this->loadModel('project')->setMenu($output['projectID']); + } + else + { + $this->qa->setMenu($this->products, $productID); + } foreach($output as $paramKey => $paramValue) { diff --git a/module/testtask/js/common.js b/module/testtask/js/common.js index 17ed4d0430..b787ef3e37 100644 --- a/module/testtask/js/common.js +++ b/module/testtask/js/common.js @@ -54,7 +54,11 @@ function createBug(obj) var onlybody = config.onlybody; config.onlybody = 'no'; - window.open(createLink('bug', 'create', params + ',stepIdList=' + stepIdList), '_parent'); + + var link = createLink('bug', 'create', params + ',stepIdList=' + stepIdList); + if(onlybody = 'yes') link += '#app=qa'; + window.parent.$.apps.open(link); + config.onlybody = onlybody; }