From 5f1823691c26641d2b990c1b12f52896f8ed3823 Mon Sep 17 00:00:00 2001 From: liugang Date: Mon, 14 May 2018 11:08:10 +0800 Subject: [PATCH 1/7] * Refact library of testsuite. --- module/block/lang/zh-tw.php | 43 ++- module/common/lang/en.php | 9 +- module/common/lang/zh-cn.php | 9 +- module/common/view/datatable.fix.html.php | 9 +- module/dev/lang/zh-tw.php | 2 + module/product/lang/zh-tw.php | 2 +- module/product/view/browse.html.php | 2 - module/product/view/view.html.php | 9 +- module/testsuite/css/library.css | 2 + module/testsuite/lang/en.php | 1 + module/testsuite/lang/zh-cn.php | 1 + module/testsuite/lang/zh-tw.php | 1 + module/testsuite/view/createlib.html.php | 42 +-- module/testsuite/view/edit.html.php | 6 +- module/testsuite/view/library.html.php | 350 +++++++++++----------- module/testsuite/view/libview.html.php | 61 ++-- module/tree/control.php | 2 +- 17 files changed, 277 insertions(+), 274 deletions(-) diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php index da8d3fd2a3..57581cdb91 100644 --- a/module/block/lang/zh-tw.php +++ b/module/block/lang/zh-tw.php @@ -111,29 +111,40 @@ $lang->block->default['project']['4']['params']['num'] = 15; $lang->block->default['project']['4']['params']['orderBy'] = 'id_desc'; $lang->block->default['project']['4']['params']['type'] = 'assignedTo'; -$lang->block->default['qa']['1']['title'] = '指派給我的Bug'; -$lang->block->default['qa']['1']['block'] = 'bug'; -$lang->block->default['qa']['1']['grid'] = 4; +$lang->block->default['qa']['1']['title'] = '測試統計'; +$lang->block->default['qa']['1']['block'] = 'statistic'; +$lang->block->default['qa']['1']['grid'] = 8; -$lang->block->default['qa']['1']['params']['num'] = 15; $lang->block->default['qa']['1']['params']['orderBy'] = 'id_desc'; -$lang->block->default['qa']['1']['params']['type'] = 'assignedTo'; +$lang->block->default['qa']['1']['params']['type'] = 'noclosed'; -$lang->block->default['qa']['2']['title'] = '指派給我的用例'; -$lang->block->default['qa']['2']['block'] = 'case'; +//$lang->block->default['qa']['2']['title'] = '測試用例總覽'; +//$lang->block->default['qa']['2']['block'] = 'overview'; +//$lang->block->default['qa']['2']['grid'] = 4; + +$lang->block->default['qa']['2']['title'] = '指派給我的Bug'; +$lang->block->default['qa']['2']['block'] = 'bug'; $lang->block->default['qa']['2']['grid'] = 4; $lang->block->default['qa']['2']['params']['num'] = 15; $lang->block->default['qa']['2']['params']['orderBy'] = 'id_desc'; -$lang->block->default['qa']['2']['params']['type'] = 'assigntome'; +$lang->block->default['qa']['2']['params']['type'] = 'assignedTo'; -$lang->block->default['qa']['3']['title'] = '待測版本列表'; -$lang->block->default['qa']['3']['block'] = 'testtask'; +$lang->block->default['qa']['3']['title'] = '指派給我的用例'; +$lang->block->default['qa']['3']['block'] = 'case'; $lang->block->default['qa']['3']['grid'] = 4; $lang->block->default['qa']['3']['params']['num'] = 15; $lang->block->default['qa']['3']['params']['orderBy'] = 'id_desc'; -$lang->block->default['qa']['3']['params']['type'] = 'wait'; +$lang->block->default['qa']['3']['params']['type'] = 'assigntome'; + +$lang->block->default['qa']['4']['title'] = '待測版本列表'; +$lang->block->default['qa']['4']['block'] = 'testtask'; +$lang->block->default['qa']['4']['grid'] = 8; + +$lang->block->default['qa']['4']['params']['num'] = 15; +$lang->block->default['qa']['4']['params']['orderBy'] = 'id_desc'; +$lang->block->default['qa']['4']['params']['type'] = 'wait'; $lang->block->default['full']['my']['1']['title'] = '歡迎'; $lang->block->default['full']['my']['1']['block'] = 'welcome'; @@ -251,9 +262,11 @@ $lang->block->modules['project']->availableBlocks->task = '任務列表'; $lang->block->modules['project']->availableBlocks->build = '版本列表'; $lang->block->modules['qa'] = new stdclass(); $lang->block->modules['qa']->availableBlocks = new stdclass(); -$lang->block->modules['qa']->availableBlocks->bug = 'Bug列表'; -$lang->block->modules['qa']->availableBlocks->case = '用例列表'; -$lang->block->modules['qa']->availableBlocks->testtask = '版本列表'; +$lang->block->modules['qa']->availableBlocks->statistic = '測試統計'; +//$lang->block->modules['qa']->availableBlocks->overview = '測試用例總覽'; +$lang->block->modules['qa']->availableBlocks->bug = 'Bug列表'; +$lang->block->modules['qa']->availableBlocks->case = '用例列表'; +$lang->block->modules['qa']->availableBlocks->testtask = '版本列表'; $lang->block->modules['todo'] = new stdclass(); $lang->block->modules['todo']->availableBlocks = new stdclass(); $lang->block->modules['todo']->availableBlocks->list = '待辦列表'; @@ -350,7 +363,7 @@ $lang->block->typeList->testtask['done'] = '已測版本'; $lang->block->typeList->testtask['all'] = '全部'; $lang->block->modules['product']->moreLinkList = new stdclass(); -$lang->block->modules['product']->moreLinkList->list = 'product|all|product=&status=%s'; +$lang->block->modules['product']->moreLinkList->list = 'product|all|product=&line=0&status=%s'; $lang->block->modules['product']->moreLinkList->story = 'my|story|type=%s'; $lang->block->modules['project']->moreLinkList = new stdclass(); $lang->block->modules['project']->moreLinkList->list = 'project|all|status=%s&project='; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index d84c07c4cd..c42c3d9610 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -762,11 +762,10 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest') /* Adjust sub menu of caselib module. */ $lang->caselib->menu = new stdclass(); - $lang->caselib->menu->lib = array('link' => '%s', 'fixed' => true); - $lang->caselib->menu->all = 'All|testsuite|library|libID=%s&browseType=all'; - $lang->caselib->menu->wait = 'Wait|testsuite|library|libID=%s&browseType=wait'; - $lang->caselib->menu->view = 'View|testsuite|libview|libID=%s'; - $lang->caselib->menu->create = array('link' => " Create Library|testsuite|createLib", 'float' => 'right'); + $lang->caselib->menu->lib = array('link' => '%s', 'fixed' => true); + $lang->caselib->menu->all = 'All|testsuite|library|libID=%s&browseType=all'; + $lang->caselib->menu->wait = 'Wait|testsuite|library|libID=%s&browseType=wait'; + $lang->caselib->menu->view = 'View|testsuite|libview|libID=%s'; $lang->caselib->menuOrder[5] = 'lib'; $lang->caselib->menuOrder[10] = 'all'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index dff44040ff..25891eba45 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -765,11 +765,10 @@ if(isset($config->global->flow) and $config->global->flow == 'onlyTest') /* Adjust sub menu of caselib module. */ $lang->caselib->menu = new stdclass(); - $lang->caselib->menu->lib = array('link' => '%s', 'fixed' => true); - $lang->caselib->menu->all = '所有|testsuite|library|libID=%s&browseType=all'; - $lang->caselib->menu->wait = '待评审|testsuite|library|libID=%s&browseType=wait'; - $lang->caselib->menu->view = '概况|testsuite|libview|libID=%s'; - $lang->caselib->menu->create = array('link' => " 创建库|testsuite|createLib", 'float' => 'right'); + $lang->caselib->menu->lib = array('link' => '%s', 'fixed' => true); + $lang->caselib->menu->all = '所有|testsuite|library|libID=%s&browseType=all'; + $lang->caselib->menu->wait = '待评审|testsuite|library|libID=%s&browseType=wait'; + $lang->caselib->menu->view = '概况|testsuite|libview|libID=%s'; $lang->caselib->menuOrder[5] = 'lib'; $lang->caselib->menuOrder[10] = 'all'; diff --git a/module/common/view/datatable.fix.html.php b/module/common/view/datatable.fix.html.php index c10e9432b7..f5b85ed219 100644 --- a/module/common/view/datatable.fix.html.php +++ b/module/common/view/datatable.fix.html.php @@ -2,6 +2,11 @@ -
- recTotal}&recPerPage={$pager->recPerPage}";?> - - - - - - - - - - - - - - - - - createLink('testcase', 'view', "caseID=$case->id&version=$case->version");?> - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + +
idAB);?> priAB);?> testcase->title);?> typeAB);?> openedByAB);?> statusAB);?>actions;?>
- - id));?> - testcase->priList, $case->pri, $case->pri)?>'>testcase->priList, $case->pri, $case->pri);?> - module)echo "{$modulePairs[$case->module]} ";?> - title, null, "style='color: $case->color'");?> - testcase->typeList[$case->type];?>openedBy];?> testcase->statusList[$case->status];?> - - testcase->needReview or !empty($config->testcase->forceReview)) common::printIcon('testcase', 'review', "caseID=$case->id", $case, 'list', 'review', '', 'iframe'); - common::printIcon('testcase', 'edit', "caseID=$case->id", $case, 'list'); - if(common::hasPriv('testcase', 'delete')) - { - $deleteURL = $this->createLink('testcase', 'delete', "caseID=$case->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"caseList\",confirmDelete)", '', '', "title='{$lang->testcase->delete}' class='btn-icon'"); - } - ?> -
- -
- -
- createLink('testcase', 'batchEdit', "libID=$libID&branch=0&type=lib"); - $misc = common::hasPriv('testcase', 'batchEdit') ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'"; - echo html::commonButton($lang->edit, $misc); - ?> - - +
+
+ + + + testcase->needReview or !empty($config->testcase->forceReview));?> + + + recTotal}&recPerPage={$pager->recPerPage}";?> + + + + - -
+ +
+
- - -
show();?>
- -
- + + idAB);?> + +
priAB);?>testcase->title);?> typeAB);?> openedByAB);?>statusAB);?>actions;?>
+ + id => sprintf('%03d', $case->id)));?> + + id);?> + + testcase->priList, $case->pri, $case->pri);?> + module) echo "{$modulePairs[$case->module]} ";?> + createLink('testcase', 'view', "caseID=$case->id&version=$case->version");?> + title, null, "style='color: $case->color'");?> + testcase->typeList[$case->type];?>openedBy];?> testcase->statusList[$case->status];?> + testcase->needReview or !empty($config->testcase->forceReview)) common::printIcon('testcase', 'review', "caseID=$case->id", $case, 'list', 'review', '', 'iframe'); + common::printIcon('testcase', 'edit', "caseID=$case->id", $case, 'list'); + if(common::hasPriv('testcase', 'delete')) + { + $deleteURL = $this->createLink('testcase', 'delete', "caseID=$case->id&confirm=yes"); + echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"caseList\",confirmDelete)", '', '', "title='{$lang->testcase->delete}' class='btn'"); + } + ?> +
+
+ +
+
+
+ createLink('testcase', 'batchEdit', "libID=$libID&branch=0&type=lib");?> + + edit, $misc);?> + + + + +
+
+ + show('right', 'pagerjs');?> +
+ + +
+

product->noProduct;?> " . $lang->product->create, '', "class='btn btn-info'");?>

+
From d4af3e2d0039bd32e402743a0ac313aca4ed94ca Mon Sep 17 00:00:00 2001 From: wangyidong Date: Mon, 14 May 2018 14:57:13 +0800 Subject: [PATCH 5/7] * finish task #4091. --- module/common/lang/en.php | 37 ++-- module/common/lang/zh-cn.php | 33 +++- module/project/view/grouptask.html.php | 153 ++++++++--------- module/story/control.php | 11 +- module/story/view/zerocase.html.php | 4 +- module/testcase/control.php | 3 + module/testcase/js/groupcase.js | 4 - module/testcase/view/browse.html.php | 6 +- module/testcase/view/caseheader.html.php | 209 +++++++++++------------ module/testcase/view/groupcase.html.php | 134 +++++++++------ 10 files changed, 319 insertions(+), 275 deletions(-) diff --git a/module/common/lang/en.php b/module/common/lang/en.php index c42c3d9610..5b6a93ab95 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -268,22 +268,39 @@ $lang->bug->menu->index = array('link' => "QA|qa|in $lang->testcase = new stdclass(); $lang->testcase->menu = new stdclass(); - -$lang->testcase->menu->product = array('link' => '%s', 'fixed' => true); $lang->testcase->menu->bug = array('link' => 'Bug|bug|browse|productID=%s'); $lang->testcase->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree'); -$lang->testcase->menu->testtask = array('link' => 'Build|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report'); -$lang->testcase->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s', 'alias' => 'view,create,edit,linkcase'); -$lang->testcase->menu->report = array('link' => 'Report|testreport|browse|productID=%s', 'alias' => 'view,create,edit'); +$lang->testcase->menu->testtask = array('link' => 'Build|testtask|browse|productID=%s'); +$lang->testcase->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s'); +$lang->testcase->menu->report = array('link' => 'Report|testreport|browse|productID=%s'); $lang->testcase->menu->caselib = array('link' => 'Library|testsuite|library'); -$lang->testcase->menu->index = array('link' => "QA|qa|index|locate=no&productID=%s", 'float' => 'right'); $lang->testtask = new stdclass(); -$lang->testtask->menu = $lang->testcase->menu; +$lang->testtask->menu = new stdclass(); +$lang->testtask->menu->bug = array('link' => 'Bug|bug|browse|productID=%s'); +$lang->testtask->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s'); +$lang->testtask->menu->testtask = array('link' => 'Build|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report'); +$lang->testtask->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s'); +$lang->testtask->menu->report = array('link' => 'Report|testreport|browse|productID=%s'); +$lang->testtask->menu->caselib = array('link' => 'Library|testsuite|library'); + $lang->testsuite = new stdclass(); -$lang->testsuite->menu = $lang->testcase->menu; +$lang->testsuite->menu = new stdclass(); +$lang->testsuite->menu->bug = array('link' => 'Bug|bug|browse|productID=%s'); +$lang->testsuite->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s'); +$lang->testsuite->menu->testtask = array('link' => 'Build|testtask|browse|productID=%s'); +$lang->testsuite->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s', 'alias' => 'view,create,edit,linkcase'); +$lang->testsuite->menu->report = array('link' => 'Report|testreport|browse|productID=%s'); +$lang->testsuite->menu->caselib = array('link' => 'Library|testsuite|library'); + $lang->testreport = new stdclass(); -$lang->testreport->menu = $lang->testcase->menu; +$lang->testreport->menu = new stdclass(); +$lang->testreport->menu->bug = array('link' => 'Bug|bug|browse|productID=%s'); +$lang->testreport->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s'); +$lang->testreport->menu->testtask = array('link' => 'Build|testtask|browse|productID=%s'); +$lang->testreport->menu->testsuite = array('link' => 'Suite|testsuite|browse|productID=%s'); +$lang->testreport->menu->report = array('link' => 'Report|testreport|browse|productID=%s', 'alias' => 'view,create,edit'); +$lang->testreport->menu->caselib = array('link' => 'Library|testsuite|library'); $lang->caselib = new stdclass(); $lang->caselib->menu = new stdclass(); @@ -294,8 +311,6 @@ $lang->caselib->menu->testtask = array('link' => 'Build|testtask|browse|'); $lang->caselib->menu->testsuite = array('link' => 'Suite|testsuite|browse|'); $lang->caselib->menu->report = array('link' => 'Report|testreport|browse|'); $lang->caselib->menu->caselib = array('link' => 'Library|testsuite|library', 'alias' => 'createlib,createcase,libview,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase'); -$lang->caselib->menu->create = array('link' => "Create a Library|testsuite|createLib|", 'float' => 'right'); -$lang->caselib->menu->index = array('link' => "Test Home|qa|index|locate=no&productID=%s", 'float' => 'right'); /* 文档视图菜单设置。*/ $lang->doc = new stdclass(); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 25891eba45..315391ea31 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -279,20 +279,39 @@ $lang->bug->menu->caselib = array('link' => '用例库|testsuite|library'); $lang->testcase = new stdclass(); $lang->testcase->menu = new stdclass(); - $lang->testcase->menu->bug = array('link' => 'Bug|bug|browse|productID=%s'); $lang->testcase->menu->testcase = array('link' => '用例|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree'); -$lang->testcase->menu->testtask = array('link' => '测试单|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report'); -$lang->testcase->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s', 'alias' => 'view,create,edit,linkcase'); -$lang->testcase->menu->report = array('link' => '报告|testreport|browse|productID=%s', 'alias' => 'view,create,edit'); +$lang->testcase->menu->testtask = array('link' => '测试单|testtask|browse|productID=%s'); +$lang->testcase->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s'); +$lang->testcase->menu->report = array('link' => '报告|testreport|browse|productID=%s'); $lang->testcase->menu->caselib = array('link' => '用例库|testsuite|library'); $lang->testtask = new stdclass(); -$lang->testtask->menu = $lang->testcase->menu; +$lang->testtask->menu = new stdclass(); +$lang->testtask->menu->bug = array('link' => 'Bug|bug|browse|productID=%s'); +$lang->testtask->menu->testcase = array('link' => '用例|testcase|browse|productID=%s'); +$lang->testtask->menu->testtask = array('link' => '测试单|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report'); +$lang->testtask->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s'); +$lang->testtask->menu->report = array('link' => '报告|testreport|browse|productID=%s'); +$lang->testtask->menu->caselib = array('link' => '用例库|testsuite|library'); + $lang->testsuite = new stdclass(); -$lang->testsuite->menu = $lang->testcase->menu; +$lang->testsuite->menu = new stdclass(); +$lang->testsuite->menu->bug = array('link' => 'Bug|bug|browse|productID=%s'); +$lang->testsuite->menu->testcase = array('link' => '用例|testcase|browse|productID=%s'); +$lang->testsuite->menu->testtask = array('link' => '测试单|testtask|browse|productID=%s'); +$lang->testsuite->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s', 'alias' => 'view,create,edit,linkcase'); +$lang->testsuite->menu->report = array('link' => '报告|testreport|browse|productID=%s'); +$lang->testsuite->menu->caselib = array('link' => '用例库|testsuite|library'); + $lang->testreport = new stdclass(); -$lang->testreport->menu = $lang->testcase->menu; +$lang->testreport->menu = new stdclass(); +$lang->testreport->menu->bug = array('link' => 'Bug|bug|browse|productID=%s'); +$lang->testreport->menu->testcase = array('link' => '用例|testcase|browse|productID=%s'); +$lang->testreport->menu->testtask = array('link' => '测试单|testtask|browse|productID=%s'); +$lang->testreport->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s'); +$lang->testreport->menu->report = array('link' => '报告|testreport|browse|productID=%s', 'alias' => 'view,create,edit'); +$lang->testreport->menu->caselib = array('link' => '用例库|testsuite|library'); $lang->caselib = new stdclass(); $lang->caselib->menu = new stdclass(); diff --git a/module/project/view/grouptask.html.php b/module/project/view/grouptask.html.php index e11a4925d9..ea2e0e9cb7 100644 --- a/module/project/view/grouptask.html.php +++ b/module/project/view/grouptask.html.php @@ -104,10 +104,10 @@ actions;?> - - - $groupTasks):?> - + + $groupTasks):?> + lang->task->noStory : zget($groupByList, $groupKey); if($groupBy == 'assignedTo' and $groupName == '') $groupName = $this->lang->task->noAssigned; - ?> - $task) - { - $groupEstimate += $task->estimate; - $groupConsumed += $task->consumed; - $groupLeft += ($task->status == 'cancel' ? 0 : $task->left); + ?> + $task) + { + $groupEstimate += $task->estimate; + $groupConsumed += $task->consumed; + $groupLeft += ($task->status == 'cancel' ? 0 : $task->left); - if($task->status == 'wait') $groupWait++; - if($task->status == 'doing') $groupDoing++; - if($task->status == 'done') $groupDone++; - if($task->status == 'closed') $groupClosed++; - } - $groupSum = count($groupTasks); - ?> - - - assignedTo == $app->user->account ? "style='color:red'" : '';?> - createLink('task','view',"taskID=$task->id"); ?> - 1 and $i == 0) echo "class='divider-top'";?>> - - - " . $groupName, '', "class='text-primary' title='$groupName'");?> -
+ if($task->status == 'wait') $groupWait++; + if($task->status == 'doing') $groupDoing++; + if($task->status == 'done') $groupDone++; + if($task->status == 'closed') $groupClosed++; + } + $groupSum = count($groupTasks); + ?> + + + assignedTo == $app->user->account ? "style='color:red'" : '';?> + createLink('task','view',"taskID=$task->id"); ?> + 1 and $i == 0) echo "class='divider-top'";?>> + + + " . $groupName, '', "class='text-primary' title='$groupName'");?> +
- assignedTo])) printf($lang->project->memberHoursAB, $users[$task->assignedTo], $members[$task->assignedTo]->totalHours);?> - project->groupSummaryAB, $groupSum, $groupWait, $groupDoing, $groupEstimate, $groupConsumed, $groupLeft);?> -
- + assignedTo])) printf($lang->project->memberHoursAB, $users[$task->assignedTo], $members[$task->assignedTo]->totalHours);?> + project->groupSummaryAB, $groupSum, $groupWait, $groupDoing, $groupEstimate, $groupConsumed, $groupLeft);?> +
+ + + id;?> + pri?>'>task->priList, $task->pri, $task->pri);?> + + team)) echo '' . $lang->task->multipleAB . ' '; + if(!empty($task->parent)) echo '' . $lang->task->childrenAB . ' '; + if(isset($task->children) && $task->children == true) echo '' . $lang->task->parentAB . ' '; + if(!common::printLink('task', 'view', "task=$task->id", $task->name)) echo $task->name; + ?> + + task->statusList[$task->status];?> + createLink('task', 'assignTo', "projectID=$task->project&taskID=$task->id", 'html', true), ' ' . $task->assignedToRealName, '', "class='iframe btn btn-icon-left' $assignedToClass");?> + finishedBy);?> + estimate;?> + consumed;?> + left;?> + progress . '%';?> + task->typeList, $task->type);?> + '>deadline, 0, 4) > 0) echo $task->deadline;?> + + id", '', 'list');?> + project&taskid=$task->id", '', 'list', '', 'hiddenwin');?> + + + + + + ' data-id=''> + + " . $groupName, '', "title='$groupName'");?> + + +
+ assignedTo])) printf($lang->project->memberHours, $users[$task->assignedTo], $members[$task->assignedTo]->totalHours);?> + project->countSummary, $groupSum, $groupWait, $groupDoing);?> + project->timeSummary, $groupEstimate, $groupConsumed, $groupLeft);?> +
+ + - id;?> - pri?>'>task->priList, $task->pri, $task->pri);?> - - team)) echo '' . $lang->task->multipleAB . ' '; - if(!empty($task->parent)) echo '' . $lang->task->childrenAB . ' '; - if(isset($task->children) && $task->children == true) echo '' . $lang->task->parentAB . ' '; - if(!common::printLink('task', 'view', "task=$task->id", $task->name)) echo $task->name; - ?> - - task->statusList[$task->status];?> - createLink('task', 'assignTo', "projectID=$task->project&taskID=$task->id", 'html', true), ' ' . $task->assignedToRealName, '', "class='iframe btn btn-icon-left' $assignedToClass");?> - finishedBy);?> - estimate;?> - consumed;?> - left;?> - progress . '%';?> - task->typeList, $task->type);?> - '>deadline, 0, 4) > 0) echo $task->deadline;?> - - id", '', 'list');?> - project&taskid=$task->id", '', 'list', '', 'hiddenwin');?> - - - - - - ' data-id=''> - - " . $groupName, '', "title='$groupName'");?> - - -
- assignedTo])) printf($lang->project->memberHours, $users[$task->assignedTo], $members[$task->assignedTo]->totalHours);?> - project->countSummary, $groupSum, $groupWait, $groupDoing);?> - project->timeSummary, $groupEstimate, $groupConsumed, $groupLeft);?> -
- - - - - - - + + + + + diff --git a/module/story/control.php b/module/story/control.php index 8191066f74..90a62ccd7f 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -1111,11 +1111,12 @@ class story extends control $this->view->position[] = html::a($this->createLink('testcase', 'browse', "productID=$productID"), $products[$productID]); $this->view->position[] = $this->lang->story->zeroCase; - $this->view->stories = $this->story->getZeroCase($productID, $sort); - $this->view->users = $this->user->getPairs('noletter'); - $this->view->productID = $productID; - $this->view->orderBy = $orderBy; - $this->view->suiteList = $this->loadModel('testsuite')->getSuites($productID); + $this->view->stories = $this->story->getZeroCase($productID, $sort); + $this->view->users = $this->user->getPairs('noletter'); + $this->view->productID = $productID; + $this->view->orderBy = $orderBy; + $this->view->suiteList = $this->loadModel('testsuite')->getSuites($productID); + $this->view->browseType = ''; $this->display(); } diff --git a/module/story/view/zerocase.html.php b/module/story/view/zerocase.html.php index c412d09ebc..8123d2a861 100644 --- a/module/story/view/zerocase.html.php +++ b/module/story/view/zerocase.html.php @@ -33,7 +33,7 @@ story->estimateAB);?> statusAB);?> story->stageAB);?> - actions;?> + actions;?> @@ -47,8 +47,8 @@
- id);?>
+ id);?> pri;?>'>story->priList, $story->pri)?> title);?> diff --git a/module/testcase/control.php b/module/testcase/control.php index a7e9424487..e05c02bbd0 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -174,6 +174,9 @@ class testcase extends control } } + $this->app->loadLang('project'); + $this->app->loadLang('task'); + $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testcase->common; $this->view->position[] = html::a($this->createLink('testcase', 'groupTask', "productID=$productID&groupBy=$groupBy"), $this->products[$productID]); $this->view->position[] = $this->lang->testcase->common; diff --git a/module/testcase/js/groupcase.js b/module/testcase/js/groupcase.js index 8157df3154..e69de29bb2 100644 --- a/module/testcase/js/groupcase.js +++ b/module/testcase/js/groupcase.js @@ -1,4 +0,0 @@ -$(document).ready(function() -{ - $('#' + browseType + 'Tab').addClass('active'); -}); diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php index 5568136d72..995a51de8d 100644 --- a/module/testcase/view/browse.html.php +++ b/module/testcase/view/browse.html.php @@ -198,13 +198,13 @@ js::set('branch', $branch);