* change method name getnotemptybuilds to filterlinked.

module/build/model.php

@@ -182,16 +182,16 @@ class buildModel extends model
     }
 
     /**
-     * Get link stories or bugs builds.
+     * Filter linked stories or bugs builds.
      *
      * @param  array $buildIdList
      * @access public
      * @return array
      */
-    public function getNotEmptyBuilds($buildIdList)
+    public function filterLinked($buildIdList)
     {
-        $notEmptyBuilds = array();
-        $buildList      = $this->getByList($buildIdList);
+        $linkeds   = array();
+        $buildList = $this->getByList($buildIdList);
         foreach($buildList as $build)
         {
             if(!$build->execution && !empty($build->builds))
@@ -207,10 +207,10 @@ class buildModel extends model
                 }
             }
 
-            if(!empty($build->stories) or !empty($build->bugs)) $notEmptyBuilds[$build->id] = $build->id;
+            if(!empty($build->stories) or !empty($build->bugs)) $linkeds[$build->id] = $build->id;
         }
 
-        return $notEmptyBuilds;
+        return $linkeds;
     }
 
     /**

module/projectrelease/control.php

@@ -143,7 +143,7 @@ class projectrelease extends control
         $this->view->lastRelease    = $this->projectrelease->getLast($projectID);
         $this->view->users          = $this->loadModel('user')->getPairs('noclosed');
         $this->view->confirmLink    = $this->lang->release->confirmLink;
-        $this->view->notEmptyBuilds = $this->build->getNotEmptyBuilds(array_keys($builds));
+        $this->view->notEmptyBuilds = $this->build->filterLinked(array_keys($builds));
         $this->display();
     }
 
@@ -818,7 +818,7 @@ class projectrelease extends control
         foreach($releasedBuilds as $build) unset($builds[$build]);
 
         /* Get the builds of the linked stories or bugs. */
-        $notEmptyBuilds = $this->build->getNotEmptyBuilds(array_keys($builds));
+        $notEmptyBuilds = $this->build->filterLinked(array_keys($builds));
 
         return print(html::select('build[]', $builds, '', "class='form-control chosen' multiple data-notemptybuilds='" . join(',', $notEmptyBuilds) . "'"));
     }

module/release/control.php

@@ -96,7 +96,7 @@ class release extends control
         $this->view->builds         = $builds;
         $this->view->users          = $this->loadModel('user')->getPairs('noclosed');
         $this->view->lastRelease    = $this->release->getLast($productID, $branch);
-        $this->view->notEmptyBuilds = $this->build->getNotEmptyBuilds(array_keys($builds));
+        $this->view->notEmptyBuilds = $this->build->filterLinked(array_keys($builds));
 
         $this->display();
     }

test/class/build.class.php

@@ -150,15 +150,15 @@ class buildTest
     }
 
     /**
-     * Test for getNotEmptyBuilds method
+     * Test for filterLinked method
      *
      * @param  array    $buildIdList
      * @access public
      * @return string
      */
-    public function getNotEmptyBuildsTest($buildIdList)
+    public function filterLinkedTest($buildIdList)
     {
-        $notEmptyBuilds = $this->objectModel->getNotEmptyBuilds($buildIdList);
+        $notEmptyBuilds = $this->objectModel->filterLinked($buildIdList);
         sort($notEmptyBuilds);
         return empty($notEmptyBuilds) ? 'null' : join(',', $notEmptyBuilds);
     }

test/model/build/filterlinked.php

@@ -6,7 +6,7 @@ su('admin');
 
 /**
 
-title=测试 buildModel->getNotEmptyBuilds();
+title=测试 buildModel->filterLinked();
 cid=1
 pid=1
 
@@ -61,10 +61,10 @@ $build->objectModel->dao->replace(TABLE_BUILD)->data($buildData)->exec();
 $buildId4 = $buildData->id;
 
 
-r($build->getNotEmptyBuildsTest(array()))                     && p() && e('null');    //不传任何数据
-r($build->getNotEmptyBuildsTest(array($buildId1)))            && p() && e('null');    //迭代版本未关联需求和Bug
-r($build->getNotEmptyBuildsTest(array($buildId2)))            && p() && e('101');     //迭代版本关联需求和Bug
-r($build->getNotEmptyBuildsTest(array($buildId3)))            && p() && e('102');     //项目版本关联版本关联需求和Bug
-r($build->getNotEmptyBuildsTest(array($buildId4)))            && p() && e('null');    //项目版本关联版本未关联需求和Bug
-r($build->getNotEmptyBuildsTest(array($buildId1, $buildId2))) && p() && e('101');     //版本列表中关联需求和Bug
-r($build->getNotEmptyBuildsTest(array($buildId3, $buildId2))) && p() && e('101,102'); //版本列表中混合项目版本和迭代版本
+r($build->filterLinkedTest(array()))                     && p() && e('null');    //不传任何数据
+r($build->filterLinkedTest(array($buildId1)))            && p() && e('null');    //迭代版本未关联需求和Bug
+r($build->filterLinkedTest(array($buildId2)))            && p() && e('101');     //迭代版本关联需求和Bug
+r($build->filterLinkedTest(array($buildId3)))            && p() && e('102');     //项目版本关联版本关联需求和Bug
+r($build->filterLinkedTest(array($buildId4)))            && p() && e('null');    //项目版本关联版本未关联需求和Bug
+r($build->filterLinkedTest(array($buildId1, $buildId2))) && p() && e('101');     //版本列表中关联需求和Bug
+r($build->filterLinkedTest(array($buildId3, $buildId2))) && p() && e('101,102'); //版本列表中混合项目版本和迭代版本