Merge branch 'zentaopms_281'

module/testtask/control.php

@@ -1059,6 +1059,11 @@ class testtask extends control
      * Link cases to a test task.
      *
      * @param  int    $taskID
+     * @param  string $type
+     * @param  int    $param
+     * @param  int    $recTotal
+     * @param  int    $recPerPage
+     * @param  int    $pageID
      * @access public
      * @return void
      */
@@ -1107,7 +1112,21 @@ class testtask extends control
         $this->config->testcase->search['actionURL'] = inlink('linkcase', "taskID=$taskID&type=$type&param=$param");
         $this->config->testcase->search['style']     = 'simple';
 
+        $build   = $this->loadModel('build')->getByID($task->build);
+        $stories = array();
+        if($build)
+        {
+            $stories = $this->dao->select('id,title')->from(TABLE_STORY)->where('id')->in($build->stories)->fetchPairs();
+            $this->config->testcase->search['params']['story']['values'] = $stories;
+            $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'story');
+        }
+
         if($product->shadow) unset($this->config->testcase->search['fields']['product']);
+        if($type != 'bystory')
+        {
+            unset($this->config->testcase->search['fields']['story']);
+            unset($this->config->testcase->search['params']['story']);
+        }
         if($task->productType == 'normal')
         {
             unset($this->config->testcase->search['fields']['branch']);