diff --git a/module/bug/control.php b/module/bug/control.php index 7c12932430..77aac56822 100755 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -2425,6 +2425,12 @@ class bug extends control $products = array(); if(!empty($extra)) $products = $this->product->getProducts($extra, 'all', 'program desc, line desc, '); + if($this->config->systemMode == 'ALM') + { + $this->view->programs = $this->loadModel('program')->getPairs(true); + $this->view->lines = $this->product->getLinePairs(); + } + $this->view->link = $this->product->getProductLink($module, $method, $extra); $this->view->productID = $productID; $this->view->module = $module; @@ -2432,8 +2438,6 @@ class bug extends control $this->view->extra = $extra; $this->view->products = $products; $this->view->projectID = $this->session->project; - $this->view->programs = $this->loadModel('program')->getPairs(true); - $this->view->lines = $this->product->getLinePairs(); $this->display(); } diff --git a/module/bug/view/ajaxgetdropmenu.html.php b/module/bug/view/ajaxgetdropmenu.html.php index c4c129476a..af69f3582d 100644 --- a/module/bug/view/ajaxgetdropmenu.html.php +++ b/module/bug/view/ajaxgetdropmenu.html.php @@ -22,8 +22,8 @@ $productsHtml = count($products) > 1 ? html::a($linkHtml, $this->lang->bug->al foreach($products as $product) { $selected = $product->id == $productID ? 'selected' : ''; - $productName = $product->program ? zget($programs, $product->program, '') . '/' : ''; - $productName .= $product->line ? zget($lines, $product->line, '') . '/' . $product->name : $product->name; + $productName = ($product->program and $this->config->systemMode == 'ALM') ? zget($programs, $product->program, '') . '/' : ''; + $productName .= ($this->config->systemMode == 'ALM' and $product->line) ? zget($lines, $product->line, '') . '/' . $product->name : $product->name; $objectID = ($product->type != 'platform' && $module == 'branch' && $method == 'manage') ? $productID : $product->id; $linkHtml = $this->product->setParamsForLink($module, $link, $projectID, $product->id); $productsHtml .= html::a($linkHtml, $productName, '', "class='text-primary $selected' title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='{$this->app->tab}'");