diff --git a/module/testcase/control.php b/module/testcase/control.php index 2a23969c4d..cf507e55ac 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -136,7 +136,6 @@ class testcase extends control $this->view->suiteID = $suiteID; $this->view->setShowModule = true; - $this->display(); } @@ -716,6 +715,21 @@ class testcase extends control die(js::locate($this->session->caseList)); } + /** + * Batch ctory change cases. + * + * @param int $productID + * @access public + * @return void + */ + public function batchStoryChange($productID = 0) + { + $caseIDList = $this->post->caseIDList ? $this->post->caseIDList : die(js::locate($this->session->caseList)); + + foreach($caseIDList as $caseID) $this->confirmStoryChange($caseID,false); + die(js::locate($this->session->caseList)); + } + /** * Link related cases. * @@ -823,12 +837,12 @@ class testcase extends control * @access public * @return void */ - public function confirmStoryChange($caseID) + public function confirmStoryChange($caseID,$reload=true) { $case = $this->testcase->getById($caseID); $this->dao->update(TABLE_CASE)->set('storyVersion')->eq($case->latestStoryVersion)->where('id')->eq($caseID)->exec(); $this->loadModel('action')->create('case', $caseID, 'confirmed', '', $case->latestStoryVersion); - die(js::reload('parent')); + if($reload) die(js::reload('parent')); } /** diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php index 093d8d2877..97ded99957 100644 --- a/module/testcase/lang/zh-cn.php +++ b/module/testcase/lang/zh-cn.php @@ -68,6 +68,7 @@ $lang->testcase->batchEdit = "批量编辑 "; $lang->testcase->batchChangeModule = "批量修改模块"; $lang->testcase->delete = "删除"; $lang->testcase->batchDelete = "批量删除 "; +$lang->testcase->batchStoryChange = "确认变更"; $lang->testcase->browse = "用例列表"; $lang->testcase->groupCase = "分组浏览用例"; $lang->testcase->import = "导入"; diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php index 70e6545372..573578b23e 100644 --- a/module/testcase/view/browse.html.php +++ b/module/testcase/view/browse.html.php @@ -67,6 +67,10 @@ js::set('batchDelete', $lang->testcase->confirmBatchDelete); $misc = common::hasPriv('testcase', 'batchDelete') ? "onclick=\"confirmBatchDelete('$actionLink')\"" : $class; echo "
  • " . html::a('#', $lang->delete, '', $misc) . "
  • "; + $actionLink = $this->createLink('testcase', 'batchStoryChange', "productID=$productID"); + $misc = common::hasPriv('testcase', 'batchStoryChange') ? "onclick=\"setFormAction('$actionLink')\"" : $class; + echo "
  • " . html::a('#', $lang->testcase->batchStoryChange, '', $misc) . "
  • "; + $actionLink = $this->createLink('testtask', 'batchRun', "productID=$productID&orderBy=$orderBy"); $misc = common::hasPriv('testtask', 'batchRun') ? "onclick=\"setFormAction('$actionLink')\"" : $class; echo "
  • " . html::a('#', $lang->testtask->runCase, '', $misc) . "
  • ";