Merge branch 'master' into zenops_46_tanghucheng

module/testcase/control.php

@@ -535,8 +535,6 @@ class testcase extends control
 
         $currentModuleID = $moduleID ? (int)$moduleID : (int)$this->cookie->lastCaseModule;
         /* Get the status of stories are not closed. */
-        $storyStatus = $this->lang->story->statusList;
-        unset($storyStatus['closed']);
         $modules = array();
         if($currentModuleID)
         {
@@ -546,7 +544,7 @@ class testcase extends control
             $modules        = $this->tree->getAllChildID($modules);
         }
 
-        $stories = $this->story->getProductStoryPairs($productID, $branch, $modules, array_keys($storyStatus), 'id_desc', 50, 'null', 'story', false);
+        $stories = $this->story->getProductStoryPairs($productID, $branch, $modules, 'active', 'id_desc', 50, 'null', 'story', false);
         if($this->app->tab != 'qa' and $this->app->tab != 'product')
         {
             $projectID = $this->app->tab == 'project' ? $this->session->project : $this->session->execution;

module/testcase/lang/zh-cn.php

@@ -20,7 +20,7 @@ $lang->testcase->howRun           = '测试方式';
 $lang->testcase->frequency        = '使用频率';
 $lang->testcase->path             = '路径';
 $lang->testcase->lib              = "所属库";
-$lang->testcase->branch           = "分支/平台";
+$lang->testcase->branch           = "平台/分支";
 $lang->testcase->moduleAB         = '模块';
 $lang->testcase->story            = "相关{$lang->SRCommon}";
 $lang->testcase->storyVersion     = "{$lang->SRCommon}版本";
@@ -186,7 +186,7 @@ $lang->testcase->confirmDelete         = '您确认要删除该测试用例吗
 $lang->testcase->confirmBatchDelete    = '您确认要批量删除这些测试用例吗？';
 $lang->testcase->ditto                 = '同上';
 $lang->testcase->dittoNotice           = '该用例与上一用例不属于同一产品！';
-$lang->testcase->confirmUnlinkTesttask = '用例[%s]已关联在之前所属分支/平台的测试单中，调整分支/平台后，将从之前所属分支/平台的测试单中移除，请确认是否继续修改。';
+$lang->testcase->confirmUnlinkTesttask = '用例[%s]已关联在之前所属平台/分支的测试单中，调整平台/分支后，将从之前所属平台/分支的测试单中移除，请确认是否继续修改。';
 
 $lang->testcase->reviewList[0] = '否';
 $lang->testcase->reviewList[1] = '是';

module/testcase/model.php

@@ -1603,9 +1603,9 @@ class testcaseModel extends model
                 {
                     $caseID       = $this->dao->lastInsertID();
                     $parentStepID = 0;
-                    if($this->post->desc)
+                    if($data->desc)
                     {
-                        foreach($this->post->desc[$key] as $id => $desc)
+                        foreach($data->desc[$key] as $id => $desc)
                         {
                             $desc = trim($desc);
                             if(empty($desc)) continue;
@@ -1615,7 +1615,7 @@ class testcaseModel extends model
                             $stepData->case    = $caseID;
                             $stepData->version = 1;
                             $stepData->desc    = htmlSpecialString($desc);
-                            $stepData->expect  = htmlSpecialString($this->post->expect[$key][$id]);
+                            $stepData->expect  = htmlSpecialString($data->expect[$key][$id]);
                             $this->dao->insert(TABLE_CASESTEP)->data($stepData)->autoCheck()->exec();
                             if($stepData->type == 'group') $parentStepID = $this->dao->lastInsertID();
                             if($stepData->type == 'step')  $parentStepID = 0;

module/testcase/view/view.html.php

@@ -176,7 +176,7 @@
 
                     foreach($modulePath as $key => $module)
                     {
-                        if($tab == 'qa' || $tab == 'ops')
+                        if($tab == 'qa' || $tab == 'ops' || $tab == 'product')
                         {
                             if($isLibCase)
                             {