Merge branch 'pailei2'

module/testcase/control.php

@@ -263,6 +263,7 @@ class testcase extends control
         {
             if($groupBy == 'story')
             {
+                if($case->storyDeleted) continue;
                 $groupCases[$case->story][] = $case;
                 $groupByList[$case->story]  = $case->storyTitle;
             }
@@ -963,6 +964,9 @@ class testcase extends control
                 $libID     = $productID;
                 $libraries = $this->loadModel('caselib')->getLibraries();
 
+                /* Set caselib menu. */
+                $this->caselib->setLibMenu($libraries, $libID);
+
                 /* Set modules. */
                 $modules[$productID][$branch] = $this->tree->getOptionMenu($libID, 'caselib', 0, $branch);
 
@@ -1051,9 +1055,6 @@ class testcase extends control
         $showSuhosinInfo = common::judgeSuhosinSetting($countInputVars);
         if($showSuhosinInfo) $this->view->suhosinInfo = extension_loaded('suhosin') ? sprintf($this->lang->suhosinInfo, $countInputVars) : sprintf($this->lang->maxVarsInfo, $countInputVars);
 
-        $stories = $this->loadModel('story')->getProductStoryPairs($productID, $branch);
-        $this->view->stories = array('' => '', 'ditto' => $this->lang->testcase->ditto) + $stories;
-
         /* Set custom. */
         foreach(explode(',', $this->config->testcase->customBatchEditFields) as $field) $customFields[$field] = $this->lang->testcase->$field;
         $this->view->customFields = $customFields;