* Finish task #5213.

module/bug/control.php

@@ -22,13 +22,17 @@ class bug extends control
     public function __construct($moduleName = '', $methodName = '')
     {
         parent::__construct($moduleName, $methodName);
+        $products = array();
         $this->loadModel('product');
         $this->loadModel('tree');
         $this->loadModel('user');
         $this->loadModel('action');
         $this->loadModel('story');
         $this->loadModel('task');
-        $this->view->products = $this->products = $this->product->getPairs('nocode');
+
+        $productList = $this->loadModel('block')->getProducts('noclosed', ''); 
+        foreach($productList as $product) $products[$product->id] = $product->name;
+        $this->view->products = $this->products = $products;
 
         if($this->config->global->flow == 'onlyTest')
         {

module/product/model.php

@@ -291,33 +291,14 @@ class productModel extends model
         if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getProductPairs();
 
         $orderBy  = !empty($this->config->product->orderBy) ? $this->config->product->orderBy : 'isClosed';
-        $products = $this->dao->select('id,name,line,  IF(INSTR(" closed", status) < 2, 0, 1) AS isClosed')
+        $products = $this->dao->select('*,  IF(INSTR(" closed", status) < 2, 0, 1) AS isClosed')
             ->from(TABLE_PRODUCT)
             ->where('deleted')->eq(0)
             ->beginIF(strpos($mode, 'noclosed') !== false)->andWhere('status')->ne('closed')->fi()
             ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->products)->fi()
-            ->orderBy('order_desc')
-            ->fetchAll('id');
-
-        $lines = $this->loadModel('tree')->getLinePairs();
-        $linePairs = array();
-        foreach($lines as $id => $name)
-        {
-            foreach($products as $key => $product)
-            {
-                if($product->line == $id)
-                {
-                    $linePairs[$product->id] = $name . '/' . $product->name;
-                    unset($products[$key]);
-                }
-            }
-        }
-
-        $productPairs = array();
-        foreach($products as $id => $product) $productPairs[$product->id] = $product->name;
-        $productPairs = $linePairs + $productPairs;
-
-        return $productPairs;
+            ->orderBy($orderBy)
+            ->fetchPairs('id', 'name');
+        return $products;
     }
 
     /**

module/story/control.php

@@ -141,7 +141,9 @@ class story extends control
         }
         else
         {
-            $products = $this->product->getPairs('noclosed');
+            $products = array();
+            $productList = $this->loadModel('block')->getProducts('noclosed', '');
+            foreach($productList as $product) $products[$product->id] = $product->name;
             $product  = $this->product->getById($productID ? $productID : key($products));
             if(!isset($products[$product->id])) $products[$product->id] = $product->name;
         }