Merge branch 'sunhuawei_fixbug_20335' into 'master'

Sunhuawei fixbug 20335

See merge request easycorp/zentaopms!2702

module/bug/control.php

@@ -541,7 +541,7 @@ class bug extends control
         else
         {
             $builds  = $this->loadModel('build')->getBuildPairs($productID, $branch, 'noempty,noterminate,nodone,withbranch');
-            $stories = $this->story->getProductStoryPairs($productID, $branch);
+            $stories = $this->story->getProductStoryPairs($productID, $branch, 0, 'all','id_desc', 0, 'full', 'story', false);
         }
 
         $moduleOwner = $this->bug->getModuleOwner($moduleID, $productID);

module/story/model.php

@@ -2362,6 +2362,7 @@ class storyModel extends model
      * Get stories pairs of a product.
      *
      * @param  int           $productID
+     * @param  string|int    $branch
      * @param  array|string  $moduleIdList
      * @param  string        $status
      * @param  string        $order

module/testcase/control.php

@@ -894,20 +894,18 @@ class testcase extends control
             {
                 $branchTagOption[$branchInfo->id] = $branchInfo->name . ($branchInfo->status == 'closed' ? ' (' . $this->lang->branch->statusList['closed'] . ')' : '');
             }
+
             $this->view->productID        = $productID;
             $this->view->product          = $product;
             $this->view->branchTagOption  = $branchTagOption;
             $this->view->productName      = $this->products[$productID];
             $this->view->moduleOptionMenu = $moduleOptionMenu;
-            $this->view->stories          = $this->story->getProductStoryPairs($productID, $case->branch);
+            $this->view->stories          = $this->story->getProductStoryPairs($productID, $case->branch, 0, 'all','id_desc', 0, 'full', 'story', false);
         }
         $forceNotReview = $this->testcase->forceNotReview();
         if($forceNotReview) unset($this->lang->testcase->statusList['wait']);
-        $position[]      = $this->lang->testcase->common;
-        $position[]      = $this->lang->testcase->edit;
 
         $this->view->title           = $title;
-        $this->view->position        = $position;
         $this->view->currentModuleID = $case->module;
         $this->view->users           = $this->user->getPairs('noletter');
         $this->view->case            = $case;