diff --git a/module/bug/control.php b/module/bug/control.php index 9b89aeb762..138a47f04d 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -54,7 +54,7 @@ class bug extends control $projectID = $this->session->project; $products = $this->loadModel('project')->getProducts($projectID, false); } - else if($this->app->openApp == 'execution') + elseif($this->app->openApp == 'execution') { $products = $this->loadModel('execution')->getProducts($this->session->execution, false); } @@ -62,9 +62,10 @@ class bug extends control { $products = $this->product->getPairs(); } - $this->view->products = $this->products = $products; - if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', "moduleName={$this->app->openApp}&activeMenu=bug&projectID=$projectID"))); + $this->view->products = $this->products = $products; + $openApp = ($this->app->openApp == 'project' or $this->app->openApp == 'execution') ? $this->app->openApp : 'qa'; + if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', "moduleName=$openApp&activeMenu=bug&projectID=$projectID"))); } /** diff --git a/module/program/view/project.html.php b/module/program/view/project.html.php index d9d5192046..6abb22e1a5 100644 --- a/module/program/view/project.html.php +++ b/module/program/view/project.html.php @@ -31,7 +31,7 @@ js::set('browseType', $browseType);