diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index a6baa6b868..3f1026b38f 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -129,6 +129,7 @@ $lang->bug->resolvedByMeAB = '由我解决'; $lang->bug->ditto = '同上'; $lang->bug->dittoNotice = '该bug与上一bug不属于同一产品！'; $lang->bug->noAssigned = '未指派'; +$lang->bug->noBug = '暂时没有BUG，您现在可以'; /* 页面标签。*/ $lang->bug->lblAssignedTo = '当前指派'; diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 7f4ecbd7cc..3138c153d3 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -10,8 +10,13 @@ * @link http://www.zentao.net */ ?> + + +
+

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

+
+ 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/product/view/showerrornone.html.php b/module/product/view/showerrornone.html.php index db42bd5aa2..06281348fd 100644 --- a/module/product/view/showerrornone.html.php +++ b/module/product/view/showerrornone.html.php @@ -11,11 +11,8 @@ */ ?> - +
+

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

+
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);