diff --git a/module/index/control.php b/module/index/control.php index 3f47bd2f86..a48e7c0ced 100644 --- a/module/index/control.php +++ b/module/index/control.php @@ -32,7 +32,6 @@ class index extends control */ public function index() { - if($this->app->getViewType() == 'mhtml') $this->locate($this->createLink($this->config->locate->module, $this->config->locate->method, $this->config->locate->params)); $this->locate($this->createLink('my', 'index')); } diff --git a/module/product/control.php b/module/product/control.php index 43c9f2a44b..117c0b3346 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -63,7 +63,7 @@ class product extends control if($locate == 'yes') $this->locate($this->createLink($this->moduleName, 'browse')); - unset($this->lang->product->menu->index); + if($this->app->getViewType() != 'mhtml') unset($this->lang->product->menu->index); $productID = $this->product->saveState($productID, $this->products); $branch = (int)$this->cookie->preBranch; $this->product->setMenu($this->products, $productID, $branch); diff --git a/module/qa/control.php b/module/qa/control.php index e9e873414f..1b72f5471a 100644 --- a/module/qa/control.php +++ b/module/qa/control.php @@ -35,7 +35,7 @@ class qa extends control if($homepage == 'browse' and $locate == 'auto') $locate = 'yes'; if($locate == 'yes') $this->locate($this->createLink('bug', 'browse')); - unset($this->lang->qa->menu->index); + if($this->app->viewType != 'mhtml') unset($this->lang->qa->menu->index); $productID = $this->product->saveState($productID, $this->products); $branch = (int)$this->cookie->preBranch; $this->qa->setMenu($this->products, $productID, $branch); diff --git a/module/report/model.php b/module/report/model.php index 8509c23cde..c876eef398 100644 --- a/module/report/model.php +++ b/module/report/model.php @@ -188,14 +188,17 @@ class reportModel extends model foreach($unplannedStories as $story) { $product = $story->product; - if(!isset($products[$product]->plans[0])) + if(isset($products[$product])) { - $products[$product]->plans[0] = new stdClass(); - $products[$product]->plans[0]->title = $this->lang->report->unplanned; - $products[$product]->plans[0]->begin = ''; - $products[$product]->plans[0]->end = ''; + if(!isset($products[$product]->plans[0])) + { + $products[$product]->plans[0] = new stdClass(); + $products[$product]->plans[0]->title = $this->lang->report->unplanned; + $products[$product]->plans[0]->begin = ''; + $products[$product]->plans[0]->end = ''; + } + $products[$product]->plans[0]->status[$story->status] = isset($products[$product]->plans[0]->status[$story->status]) ? $products[$product]->plans[0]->status[$story->status] + 1 : 1; } - $products[$product]->plans[0]->status[$story->status] = isset($products[$product]->plans[0]->status[$story->status]) ? $products[$product]->plans[0]->status[$story->status] + 1 : 1; } unset($products['']); diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php index 056259f063..47e888e2a5 100644 --- a/module/testcase/view/caseheader.html.php +++ b/module/testcase/view/caseheader.html.php @@ -49,6 +49,7 @@ echo '