* Replace bugModel-getProjects with productModel-getProjectPairsByProduct, and remove bugModel-getProjects.

module/bug/model.php

@@ -741,7 +741,7 @@ class bugModel extends model
         $productParams = $productParams + array('all' => $this->lang->all);
 
         /* Get project params. */
-        $projectParams = $this->getProjects($productID);
+        $projectParams = $this->loadModel('product')->getProjectPairsByProduct($productID, 'all');
         $projectParams = $projectParams + array('all' => $this->lang->bug->allProject);
 
         /* Get all modules. */
@@ -2252,24 +2252,6 @@ class bugModel extends model
         return sprintf($this->lang->bug->notice->summary, count($bugs), $unresolved);
     }
 
-    /**
-     * Get project list.
-     *
-     * @param  int $productID
-     * @access public
-     * @return array
-     */
-    public function getProjects($productID)
-    {
-        return $this->dao->select('t1.id,t1.name')
-            ->from(TABLE_PROJECT)->alias('t1')
-            ->leftjoin(TABLE_PROJECTPRODUCT)->alias('t2')->on('t1.id = t2.project')
-            ->where('t1.type')->eq('project')
-            ->andWhere('t1.deleted')->eq(0)
-            ->andWhere('t2.product')->eq($productID)
-            ->fetchPairs();
-    }
-
     /**
      * 构造详情页或列表页需要的操作菜单。
      * Build action menu.

module/bug/test/bug.class.php

@@ -1893,31 +1893,6 @@ class bugTest
         }
     }
 
-    /**
-     * Test get project list.
-     *
-     * @param  int    $productID
-     * @access public
-     * @return string
-     */
-    public function getProjectsTest($productID)
-    {
-        $array = $this->objectModel->getProjects($productID);
-
-        $title = '';
-        foreach($array as $id => $project) $title .= ',' . $project;
-        $title = trim($title, ',');
-
-        if(dao::isError())
-        {
-            return dao::getError();
-        }
-        else
-        {
-            return $title;
-        }
-    }
-
     /**
      * Test get bug query.
      *

module/bug/test/model/getprojects.php

@@ -1,26 +0,0 @@
-#!/usr/bin/env php
-<?php
-include dirname(__FILE__, 5) . '/test/lib/init.php'; su('admin');
-include dirname(__FILE__, 2) . '/bug.class.php';
-
-zdTable('project')->gen(20);
-zdTable('product')->gen(10);
-
-/**
-
-title=bugModel->getProjects();
-cid=1
-pid=1
-
-*/
-
-$productIDList = array('1', '2', '3', '4','5', '6', '1000001');
-
-$bug=new bugTest();
-r($bug->getProjectsTest($productIDList[0])) && p() && e('项目1,项目11'); // 测试获取productID为1的项目
-r($bug->getProjectsTest($productIDList[1])) && p() && e('项目2,项目12'); // 测试获取productID为2的项目
-r($bug->getProjectsTest($productIDList[2])) && p() && e('项目3,项目13'); // 测试获取productID为3的项目
-r($bug->getProjectsTest($productIDList[3])) && p() && e('项目4,项目14'); // 测试获取productID为4的项目
-r($bug->getProjectsTest($productIDList[4])) && p() && e('项目5,项目15'); // 测试获取productID为5的项目
-r($bug->getProjectsTest($productIDList[5])) && p() && e('项目6,项目16'); // 测试获取productID为6的项目
-r($bug->getProjectsTest($productIDList[6])) && p() && e('0');            // 测试获取不存在的product的项目