From df9ac0573b65257a9ae2b1f8812c5373953629c2 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 27 Jan 2015 16:31:53 +0800 Subject: [PATCH] * finish task #2195. --- module/group/lang/resource.php | 3 +++ module/testcase/control.php | 17 ++++++++++++++++- module/testcase/js/browse.js | 13 +++++++++++++ module/testcase/lang/en.php | 6 ++++-- module/testcase/lang/zh-cn.php | 6 ++++-- module/testcase/view/browse.html.php | 5 +++++ 6 files changed, 45 insertions(+), 5 deletions(-) diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 1799a54451..b54f1c8a2f 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -446,6 +446,7 @@ $lang->resource->testcase->view = 'view'; $lang->resource->testcase->edit = 'edit'; $lang->resource->testcase->batchEdit = 'batchEdit'; $lang->resource->testcase->delete = 'delete'; +$lang->resource->testcase->batchDelete = 'batchDelete'; $lang->resource->testcase->export = 'export'; $lang->resource->testcase->exportTemplet = 'exportTemplet'; $lang->resource->testcase->import = 'import'; @@ -465,6 +466,8 @@ $lang->testcase->methodOrder[40] = 'delete'; $lang->testcase->methodOrder[45] = 'export'; $lang->testcase->methodOrder[50] = 'confirmChange'; $lang->testcase->methodOrder[55] = 'confirmStoryChange'; +$lang->testcase->methodOrder[60] = 'batchEdit'; +$lang->testcase->methodOrder[65] = 'batchDelete'; /* Test task. */ $lang->resource->testtask = new stdclass(); diff --git a/module/testcase/control.php b/module/testcase/control.php index 073e77cd2e..3cc2b54488 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -558,7 +558,7 @@ class testcase extends control die(js::locate($this->session->caseList, 'parent')); } - $caseIDList = $this->post->caseIDList ? $this->post->caseIDList : die(js::locate($this->session->caseList, 'parent')); + $caseIDList = $this->post->caseIDList ? $this->post->caseIDList : die(js::locate($this->session->caseList)); /* Get the edited cases. */ $cases = $this->dao->select('*')->from(TABLE_CASE)->where('id')->in($caseIDList)->fetchAll('id'); @@ -636,6 +636,21 @@ class testcase extends control } } + /** + * Batch delete cases. + * + * @param int $productID + * @access public + * @return void + */ + public function batchDelete($productID = 0) + { + $caseIDList = $this->post->caseIDList ? $this->post->caseIDList : die(js::locate($this->session->caseList)); + + foreach($caseIDList as $caseID) $this->testcase->delete(TABLE_CASE, $caseID); + die(js::locate($this->session->caseList)); + } + /** * Confirm testcase changed. * diff --git a/module/testcase/js/browse.js b/module/testcase/js/browse.js index 94876d9cce..121360609a 100644 --- a/module/testcase/js/browse.js +++ b/module/testcase/js/browse.js @@ -8,6 +8,19 @@ function browseBySearch(active) $('#bymoduleTab').removeClass('active'); } +/** + * Confirm batch delete cases. + * + * @param string $actionLink + * @access public + * @return void + */ +function confirmBatchDelete(actionLink) +{ + if(confirm(batchDelete)) setFormAction(actionLink); + return false; +} + $(document).ready(function() { $('#' + browseType + 'Tab').addClass('active'); diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index 086fd21f8f..6aca0a8a6c 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -61,6 +61,7 @@ $lang->testcase->view = "Info"; $lang->testcase->edit = "Edit"; $lang->testcase->batchEdit = "Batch edit"; $lang->testcase->delete = "Delete"; +$lang->testcase->batchDelete = "Batch delete "; $lang->testcase->deleted = "Deleted"; $lang->testcase->browse = "Browse"; $lang->testcase->groupCase = "View case by group"; @@ -111,8 +112,9 @@ $lang->testcase->legendHistory = 'History'; $lang->testcase->legendComment = 'Comment'; $lang->testcase->legendProduct = 'Product & module'; -$lang->testcase->confirmDelete = 'Are you sure to delete this case?'; -$lang->testcase->same = 'Ditto'; +$lang->testcase->confirmDelete = 'Are you sure to delete this case?'; +$lang->testcase->confirmBatchDelete = 'Are you sure to batch delete there cases?'; +$lang->testcase->same = 'Ditto'; $lang->testcase->priList[3] = 3; $lang->testcase->priList[1] = 1; diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php index 01ee9cddde..ef35658d4a 100644 --- a/module/testcase/lang/zh-cn.php +++ b/module/testcase/lang/zh-cn.php @@ -61,6 +61,7 @@ $lang->testcase->view = "用例详情"; $lang->testcase->edit = "编辑"; $lang->testcase->batchEdit = "批量编辑 "; $lang->testcase->delete = "删除"; +$lang->testcase->batchDelete = "批量删除 "; $lang->testcase->deleted = "已删除"; $lang->testcase->browse = "用例列表"; $lang->testcase->groupCase = "分组浏览用例"; @@ -111,8 +112,9 @@ $lang->testcase->legendHistory = '历史记录'; $lang->testcase->legendComment = '备注'; $lang->testcase->legendProduct = '产品模块'; -$lang->testcase->confirmDelete = '您确认要删除该测试用例吗？'; -$lang->testcase->same = '同上'; +$lang->testcase->confirmDelete = '您确认要删除该测试用例吗？'; +$lang->testcase->confirmBatchDelete = '您确认要批量删除这些测试用例吗？'; +$lang->testcase->same = '同上'; $lang->testcase->priList[3] = 3; $lang->testcase->priList[1] = 1; diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php index d244e54339..bab5215e53 100644 --- a/module/testcase/view/browse.html.php +++ b/module/testcase/view/browse.html.php @@ -18,6 +18,7 @@ include './caseheader.html.php'; js::set('browseType', $browseType); js::set('moduleID' , $moduleID); js::set('confirmDelete', $lang->testcase->confirmDelete); +js::set('batchDelete', $lang->testcase->confirmBatchDelete); ?>
@@ -113,6 +114,10 @@ js::set('confirmDelete', $lang->testcase->confirmDelete);