From f35df8ef4a337ba1cf1e8ac66c160ff0cec8bd8f Mon Sep 17 00:00:00 2001 From: wangchunsheng Date: Fri, 13 Nov 2009 08:20:42 +0000 Subject: [PATCH] + add methods of testcase to pri list. --- trunk/module/group/lang/zh-cn.php | 6 + trunk/module/testcase/control.php | 20 +-- trunk/module/testcase/lang/zh-cn.php | 175 +++++++++++---------- trunk/module/testcase/view/browse.html.php | 34 ++-- trunk/module/testcase/view/create.html.php | 16 +- trunk/module/testcase/view/edit.html.php | 44 +++--- trunk/module/testcase/view/view.html.php | 46 +++--- 7 files changed, 174 insertions(+), 167 deletions(-) diff --git a/trunk/module/group/lang/zh-cn.php b/trunk/module/group/lang/zh-cn.php index f9fa72594f..94f1b1f5e5 100644 --- a/trunk/module/group/lang/zh-cn.php +++ b/trunk/module/group/lang/zh-cn.php @@ -109,6 +109,12 @@ $lang->resource->bug->activate= 'activate'; $lang->resource->bug->close = 'close'; $lang->resource->bug->ajaxGetUserBugs = 'ajaxGetUserBugs'; +$lang->resource->testcase->index = 'index'; +$lang->resource->testcase->browse = 'browse'; +$lang->resource->testcase->create = 'create'; +$lang->resource->testcase->view = 'view'; +$lang->resource->testcase->edit = 'edit'; + $lang->resource->admin->index = 'index'; $lang->resource->admin->browseCompany = 'browseCompany'; $lang->resource->admin->browseUser = 'browseUser'; diff --git a/trunk/module/testcase/control.php b/trunk/module/testcase/control.php index cca7c7b2b3..f8d05521e6 100644 --- a/trunk/module/testcase/control.php +++ b/trunk/module/testcase/control.php @@ -53,12 +53,12 @@ class testcase extends control $currentModuleID = ($type == 'byModule') ? (int)$param : 0; if($currentModuleID == 0) { - $currentModuleName = $this->lang->case->allCases; + $currentModuleName = $this->lang->testcase->allCases; } else { $currentModule = $this->tree->getById($currentModuleID); - $currentModuleName = sprintf($this->lang->case->moduleCases, $currentModule->name); + $currentModuleName = sprintf($this->lang->testcase->moduleCases, $currentModule->name); } if($type == "byModule") @@ -69,9 +69,9 @@ class testcase extends control $cases = $this->testcase->getModuleCases($productID, $childModuleIds, $orderBy, $pager); } - $header['title'] = $this->products[$productID] . $this->lang->colon . $this->lang->case->common; + $header['title'] = $this->products[$productID] . $this->lang->colon . $this->lang->testcase->common; $position[] = html::a($this->createLink('testcase', 'browse', "productID=$productID"), $this->products[$productID]); - $position[] = $this->lang->case->common; + $position[] = $this->lang->testcase->common; $this->assign('header', $header); $this->assign('position', $position); @@ -105,9 +105,9 @@ class testcase extends control $productID = common::saveProductState($productID, key($this->products)); $currentModuleID = (int)$moduleID; - $header['title'] = $this->products[$productID] . $this->lang->colon . $this->lang->case->create; + $header['title'] = $this->products[$productID] . $this->lang->colon . $this->lang->testcase->create; $position[] = html::a($this->createLink('testcase', 'browse', "productID=$productID"), $this->products[$productID]); - $position[] = $this->lang->case->create; + $position[] = $this->lang->testcase->create; $users = $this->user->getPairs($this->app->company->id); $this->assign('header', $header); @@ -128,9 +128,9 @@ class testcase extends control $this->loadModel('action'); $case = $this->testcase->getById($caseID); $productID = $case->product; - $header['title'] = $this->products[$productID] . $this->lang->colon . $this->lang->case->view; + $header['title'] = $this->products[$productID] . $this->lang->colon . $this->lang->testcase->view; $position[] = html::a($this->createLink('testcase', 'browse', "productID=$productID"), $this->products[$productID]); - $position[] = $this->lang->case->view; + $position[] = $this->lang->testcase->view; $users = $this->user->getPairs($this->app->company->id, 'noletter'); $actions = $this->action->getList('case', $caseID); @@ -169,9 +169,9 @@ class testcase extends control $case = $this->testcase->getById($caseID); $productID = $case->product; $currentModuleID = $case->module; - $header['title'] = $this->products[$productID] . $this->lang->colon . $this->lang->case->edit; + $header['title'] = $this->products[$productID] . $this->lang->colon . $this->lang->testcase->edit; $position[] = html::a($this->createLink('testcase', 'browse', "productID=$productID"), $this->products[$productID]); - $position[] = $this->lang->case->edit; + $position[] = $this->lang->testcase->edit; $users = $this->user->getPairs($this->app->company->id); $this->assign('header', $header); diff --git a/trunk/module/testcase/lang/zh-cn.php b/trunk/module/testcase/lang/zh-cn.php index 959023fd1b..964cc2c357 100644 --- a/trunk/module/testcase/lang/zh-cn.php +++ b/trunk/module/testcase/lang/zh-cn.php @@ -1,6 +1,6 @@ - * @package testcase + * @package testtestcase * @version $Id$ * @link http://www.zentao.cn */ -$lang->case->common = '用例管理'; -$lang->case->index = "用例管理首页"; -$lang->case->create = "创建用例"; -$lang->case->delete = "删除用例"; -$lang->case->view = "用例详情"; -$lang->case->edit = "编辑用例"; +$lang->testcase->common = '用例管理'; +$lang->testcase->index = "用例管理首页"; +$lang->testcase->create = "创建用例"; +$lang->testcase->delete = "删除用例"; +$lang->testcase->view = "用例详情"; +$lang->testcase->edit = "编辑用例"; +$lang->testcase->browse = "用例列表"; -$lang->case->selectProduct = '请选择产品'; -$lang->case->byModule = '按模块'; -$lang->case->assignToMe = '指派给我'; -$lang->case->openedByMe = '由我创建'; -$lang->case->allCases = '所有Case'; -$lang->case->moduleCases = '%s'; +$lang->testcase->selectProduct = '请选择产品'; +$lang->testcase->byModule = '按模块'; +$lang->testcase->assignToMe = '指派给我'; +$lang->testcase->openedByMe = '由我创建'; +$lang->testcase->allCases = '所有Case'; +$lang->testcase->moduleCases = '%s'; -$lang->case->labProductAndModule = '产品模块'; -$lang->case->labTypeAndPri = '类型&优先级'; -$lang->case->labSystemBrowserAndHardware = '系统::浏览器'; -$lang->case->labAssignAndMail = '指派给::抄送给'; -$lang->case->labStory = '相关需求'; +$lang->testcase->labProductAndModule = '产品模块'; +$lang->testcase->labTypeAndPri = '类型&优先级'; +$lang->testcase->labSystemBrowserAndHardware = '系统::浏览器'; +$lang->testcase->labAssignAndMail = '指派给::抄送给'; +$lang->testcase->labStory = '相关需求'; -$lang->case->legendRelated = '相关信息'; -$lang->case->legendBasicInfo = '基本信息'; -$lang->case->legendMailto = '抄送给'; -$lang->case->legendAttatch = '附件'; -$lang->case->legendLinkBugs = '相关Bug'; -$lang->case->legendOpenInfo = '创建信息'; -$lang->case->legendLastInfo = '最后编辑'; -$lang->case->legendStoryAndTask= '需求::任务'; -$lang->case->legendCases = '相关用例'; -$lang->case->legendSteps = '用例步骤'; -$lang->case->legendAction = '操作'; -$lang->case->legendHistory = '历史记录'; -$lang->case->legendComment = '备注'; +$lang->testcase->legendRelated = '相关信息'; +$lang->testcase->legendBasicInfo = '基本信息'; +$lang->testcase->legendMailto = '抄送给'; +$lang->testcase->legendAttatch = '附件'; +$lang->testcase->legendLinkBugs = '相关Bug'; +$lang->testcase->legendOpenInfo = '创建信息'; +$lang->testcase->legendLastInfo = '最后编辑'; +$lang->testcase->legendStoryAndTask= '需求::任务'; +$lang->testcase->legendCases = '相关用例'; +$lang->testcase->legendSteps = '用例步骤'; +$lang->testcase->legendAction = '操作'; +$lang->testcase->legendHistory = '历史记录'; +$lang->testcase->legendComment = '备注'; -$lang->case->buttonEdit = '编辑'; -$lang->case->buttonActivate = '激活'; -$lang->case->buttonResolve = '解决'; -$lang->case->buttonClose = '关闭'; -$lang->case->buttonToList = '返回列表'; +$lang->testcase->buttonEdit = '编辑'; +$lang->testcase->buttonActivate = '激活'; +$lang->testcase->buttonResolve = '解决'; +$lang->testcase->buttonClose = '关闭'; +$lang->testcase->buttonToList = '返回列表'; -$lang->case->priList[3] = 3; -$lang->case->priList[1] = 1; -$lang->case->priList[2] = 2; -$lang->case->priList[4] = 4; +$lang->testcase->priList[3] = 3; +$lang->testcase->priList[1] = 1; +$lang->testcase->priList[2] = 2; +$lang->testcase->priList[4] = 4; /* Define the OS list. */ -$lang->case->osList->all = '全部'; -$lang->case->osList->winxp = 'Windows XP'; -$lang->case->osList->win2000 = 'Windows 2000'; -$lang->case->osList->winnt = 'Windows NT'; -$lang->case->osList->win98 = 'Windows 98'; -$lang->case->osList->linux = 'Linux'; -$lang->case->osList->unix = 'Unix'; -$lang->case->osList->others = '其他'; +$lang->testcase->osList->all = '全部'; +$lang->testcase->osList->winxp = 'Windows XP'; +$lang->testcase->osList->win2000 = 'Windows 2000'; +$lang->testcase->osList->winnt = 'Windows NT'; +$lang->testcase->osList->win98 = 'Windows 98'; +$lang->testcase->osList->linux = 'Linux'; +$lang->testcase->osList->unix = 'Unix'; +$lang->testcase->osList->others = '其他'; /* Define the OS list. */ -$lang->case->browserList->all = '全部'; -$lang->case->browserList->ie6 = 'IE6'; -$lang->case->browserList->ie7 = 'IE7'; -$lang->case->browserList->ie8 = 'IE8'; -$lang->case->browserList->firefox2 = 'firefox2'; -$lang->case->browserList->firefx3 = 'firefox3'; -$lang->case->browserList->opera9 = 'opera9'; -$lang->case->browserList->oprea10 = '其他'; +$lang->testcase->browserList->all = '全部'; +$lang->testcase->browserList->ie6 = 'IE6'; +$lang->testcase->browserList->ie7 = 'IE7'; +$lang->testcase->browserList->ie8 = 'IE8'; +$lang->testcase->browserList->firefox2 = 'firefox2'; +$lang->testcase->browserList->firefx3 = 'firefox3'; +$lang->testcase->browserList->opera9 = 'opera9'; +$lang->testcase->browserList->oprea10 = '其他'; /* Define the types. */ -$lang->case->typeList['feature'] = '功能测试'; -$lang->case->typeList['performance'] = '性能测试'; +$lang->testcase->typeList['feature'] = '功能测试'; +$lang->testcase->typeList['performance'] = '性能测试'; -$lang->case->statusList['normal'] = '正常'; -$lang->case->statusList['blocked'] = 'Blocked'; +$lang->testcase->statusList['normal'] = '正常'; +$lang->testcase->statusList['blocked'] = 'Blocked'; -$lang->case->resolutionList->bydesign = 'By Design'; -$lang->case->resolutionList->duplicate = 'Duplicate'; -$lang->case->resolutionList->external = 'External'; -$lang->case->resolutionList->fixed = 'Fixed'; -$lang->case->resolutionList->notrepro = 'Not Repro'; -$lang->case->resolutionList->postponed = 'Postponed'; -$lang->case->resolutionList->willnotfix = "Won not Fix"; +$lang->testcase->resolutionList->bydesign = 'By Design'; +$lang->testcase->resolutionList->duplicate = 'Duplicate'; +$lang->testcase->resolutionList->external = 'External'; +$lang->testcase->resolutionList->fixed = 'Fixed'; +$lang->testcase->resolutionList->notrepro = 'Not Repro'; +$lang->testcase->resolutionList->postponed = 'Postponed'; +$lang->testcase->resolutionList->willnotfix = "Won not Fix"; -$lang->case->id = '用例编号'; -$lang->case->product = '所属产品'; -$lang->case->module = '所属模块'; -$lang->case->story = '相关需求'; -$lang->case->title = '用例标题'; -$lang->case->pri = '优 先 级'; -$lang->case->type = '用例类型'; -$lang->case->status = '用例状态'; -$lang->case->steps = '用例步骤'; -$lang->case->frequency = '执行频率'; -$lang->case->order = '排序'; -$lang->case->openedBy = '由谁创建 '; -$lang->case->openedDate = '创建日期'; -$lang->case->lastEditedBy = '最后修改者'; -$lang->case->lastEditedDate = '最后修改日期'; -$lang->case->field1 = '字段一'; -$lang->case->field2 = '字段二'; -$lang->case->feidl3 = '字段三'; -$lang->case->version = '用例版本'; +$lang->testcase->id = '用例编号'; +$lang->testcase->product = '所属产品'; +$lang->testcase->module = '所属模块'; +$lang->testcase->story = '相关需求'; +$lang->testcase->title = '用例标题'; +$lang->testcase->pri = '优 先 级'; +$lang->testcase->type = '用例类型'; +$lang->testcase->status = '用例状态'; +$lang->testcase->steps = '用例步骤'; +$lang->testcase->frequency = '执行频率'; +$lang->testcase->order = '排序'; +$lang->testcase->openedBy = '由谁创建 '; +$lang->testcase->openedDate = '创建日期'; +$lang->testcase->lastEditedBy = '最后修改者'; +$lang->testcase->lastEditedDate = '最后修改日期'; +$lang->testcase->field1 = '字段一'; +$lang->testcase->field2 = '字段二'; +$lang->testcase->feidl3 = '字段三'; +$lang->testcase->version = '用例版本'; diff --git a/trunk/module/testcase/view/browse.html.php b/trunk/module/testcase/view/browse.html.php index b3dacb9cc5..0bdba71544 100644 --- a/trunk/module/testcase/view/browse.html.php +++ b/trunk/module/testcase/view/browse.html.php @@ -35,14 +35,14 @@ function selectProduct(productID)
@@ -56,12 +56,12 @@ function selectProduct(productID) $productName"; echo "
  • " . html::a($this->createLink('testcase', 'browse', "productid=$productID&type=byModule¶m=$currentModuleID"), $currentModuleName) . "
    • "; - //echo "
  • " . html::a($this->createLink('testcase', 'browse', "productid=$productID&type=assignToMe"), $lang->case->assignToMe) . "
    • "; - //echo "
  • " . html::a($this->createLink('testcase', 'browse', "productid=$productID&type=openedByMe"), $lang->case->openedByMe) . "
    • "; - //echo "
  • " . html::a($this->createLink('testcase', 'browse', "productid=$productID&type=resolvedByMe"), $lang->case->resolvedByMe) . "
    • "; - //echo "
  • " . html::a($this->createLink('testcase', 'browse', "productid=$productID&type=assignToNull"), $lang->case->assignToNull) . "
    • "; - //echo "
  • " . html::a($this->createLink('testcase', 'browse', "productid=$productID&type=longLifeBugs"), $lang->case->longLifeBugs) . "
    • "; - //echo "
  • " . html::a($this->createLink('testcase', 'browse', "productid=$productID&type=postponedBugs"), $lang->case->postponedBugs) . "
    • "; + //echo "
  • " . html::a($this->createLink('testcase', 'browse', "productid=$productID&type=assignToMe"), $lang->testcase->assignToMe) . "
    • "; + //echo "
  • " . html::a($this->createLink('testcase', 'browse', "productid=$productID&type=openedByMe"), $lang->testcase->openedByMe) . "
    • "; + //echo "
  • " . html::a($this->createLink('testcase', 'browse', "productid=$productID&type=resolvedByMe"), $lang->testcase->resolvedByMe) . "
    • "; + //echo "
  • " . html::a($this->createLink('testcase', 'browse', "productid=$productID&type=assignToNull"), $lang->testcase->assignToNull) . "
    • "; + //echo "
  • " . html::a($this->createLink('testcase', 'browse', "productid=$productID&type=longLifeBugs"), $lang->testcase->longLifeBugs) . "
    • "; + //echo "
  • " . html::a($this->createLink('testcase', 'browse', "productid=$productID&type=postponedBugs"), $lang->testcase->postponedBugs) . "
    • "; echo << $("#{$type}Tab").addClass('active'); @@ -70,27 +70,27 @@ EOT; ?>
    - createLink('testcase', 'create', "productID=$productID&moduleID=$currentModuleID"), $lang->case->create);?> + createLink('testcase', 'create', "productID=$productID&moduleID=$currentModuleID"), $lang->testcase->create);?>
    - case->selectProduct;?> + testcase->selectProduct;?>
    - createLink('testcase', 'browse', "productId=$productID"), $lang->case->allCases);?> + createLink('testcase', 'browse', "productId=$productID"), $lang->testcase->allCases);?> createLink('tree', 'browse', "productID=$productID&view=case"), $lang->tree->manageCase);?>
    - - - - - - + + + + + + - + - +
    case->id;?>case->pri;?>case->title;?>case->type;?>case->openedBy;?>case->status;?>testcase->id;?>testcase->pri;?>testcase->title;?>testcase->type;?>testcase->openedBy;?>testcase->status;?>
    createLink('testcase', 'view', "testcaseID=$case->id"), sprintf('%03d', $case->id));?> pri?> title;?>case->typeList[$case->type];?>testcase->typeList[$case->type];?> openedBy];?>case->statusList[$case->status];?>testcase->statusList[$case->status];?>
    diff --git a/trunk/module/testcase/view/create.html.php b/trunk/module/testcase/view/create.html.php index ce6bcb0f17..fd175b064a 100644 --- a/trunk/module/testcase/view/create.html.php +++ b/trunk/module/testcase/view/create.html.php @@ -50,31 +50,31 @@ function loadStory(productID)
    - + - + - + - + - + - + diff --git a/trunk/module/testcase/view/edit.html.php b/trunk/module/testcase/view/edit.html.php index 8ecc05236c..347e330992 100644 --- a/trunk/module/testcase/view/edit.html.php +++ b/trunk/module/testcase/view/edit.html.php @@ -65,29 +65,29 @@ function loadStory(productID)
    - case->legendBasicInfo;?> + testcase->legendBasicInfo;?>
    case->create;?>testcase->create;?>
    case->labProductAndModule;?>testcase->labProductAndModule;?>
    case->labStory;?>testcase->labStory;?>
    case->title;?>testcase->title;?>
    case->steps;?>testcase->steps;?>
    case->labTypeAndPri;?>testcase->labTypeAndPri;?> - case->typeList, '', 'class=select-2');?> - case->priList, '', 'class=select-2');?> + testcase->typeList, '', 'class=select-2');?> + testcase->priList, '', 'class=select-2');?>
    - + - - + - - + - - + + - +
    case->labProductAndModule;?>testcase->labProductAndModule;?>
    case->type;?>case->typeList, $case->type, 'class=select-2');?> + testcase->type;?>testcase->typeList, $case->type, 'class=select-2');?>
    case->pri;?>case->priList, $case->pri, 'class=select-2');?> + testcase->pri;?>testcase->priList, $case->pri, 'class=select-2');?>
    case->status;?>case->statusList, $case->status, 'class=select-2');?>testcase->status;?>testcase->statusList, $case->status, 'class=select-2');?>
    case->story;?>testcase->story;?> story, 'class=select-3');?>
    @@ -95,12 +95,12 @@ function loadStory(productID) @@ -109,35 +109,35 @@ function loadStory(productID)
    - case->legendOpenInfo;?> + testcase->legendOpenInfo;?> - + - +
    case->openedBy;?>testcase->openedBy;?> openedBy;?>
    case->openedDate;?>testcase->openedDate;?> openedDate;?>
    - case->legendLastInfo;?> + testcase->legendLastInfo;?> - + - +
    case->lastEditedBy;?>testcase->lastEditedBy;?> lastEditedBy;?>
    case->lastEditedDate;?>testcase->lastEditedDate;?> lastEditedDate;?>
    @@ -148,22 +148,22 @@ function loadStory(productID)
    - case->legendSteps;?> + testcase->legendSteps;?>
    - case->legendComment;?> + testcase->legendComment;?>
    - case->legendAction;?> + testcase->legendAction;?>
    - "' />
    diff --git a/trunk/module/testcase/view/view.html.php b/trunk/module/testcase/view/view.html.php index 098db9bf75..d02075a9dc 100644 --- a/trunk/module/testcase/view/view.html.php +++ b/trunk/module/testcase/view/view.html.php @@ -29,8 +29,8 @@ CASE #id . $lang->colon . $case->title;?>
    createLink('testcase', 'edit', "caseID=$case->id"), $lang->case->buttonEdit); - if(common::hasPriv('testcase', 'browse')) echo html::a($this->createLink('testcase', 'browse', "productID=$case->product"), $lang->case->buttonToList); + if(common::hasPriv('testcase', 'edit')) echo html::a($this->createLink('testcase', 'edit', "caseID=$case->id"), $lang->testcase->buttonEdit); + if(common::hasPriv('testcase', 'browse')) echo html::a($this->createLink('testcase', 'browse', "productID=$case->product"), $lang->testcase->buttonToList); ?>
    @@ -41,10 +41,10 @@
    - case->legendBasicInfo;?> + testcase->legendBasicInfo;?> - + - - + + - + - - + + - + @@ -79,12 +79,12 @@ @@ -93,28 +93,28 @@
    - case->legendOpenInfo;?> + testcase->legendOpenInfo;?>
    case->labProductAndModule;?>testcase->labProductAndModule;?>
    case->type;?>case->typeList[$case->type];?>testcase->type;?>testcase->typeList[$case->type];?>
    case->pri;?>testcase->pri;?> pri;?>
    case->status;?>case->statusList[$case->status];?>testcase->status;?>testcase->statusList[$case->status];?>
    case->story;?>testcase->story;?> story;?>
    - + - +
    case->openedBy;?>testcase->openedBy;?> openedBy;?>
    case->openedDate;?>testcase->openedDate;?> openedDate;?>
    - case->legendLastInfo;?> + testcase->legendLastInfo;?> - + - +
    case->lastEditedBy;?>testcase->lastEditedBy;?> lastEditedBy;?>
    case->lastEditedDate;?>testcase->lastEditedDate;?> lastEditedDate;?>
    @@ -122,7 +122,7 @@ @@ -133,17 +133,17 @@
    - case->legendAction;?> + testcase->legendAction;?>
    createLink('testcase', 'edit', "caseID=$case->id"), $lang->case->buttonEdit); - if(common::hasPriv('testcase', 'browse')) echo html::a($this->createLink('testcase', 'browse', "productID=$case->product"), $lang->case->buttonToList); + if(common::hasPriv('testcase', 'edit')) echo html::a($this->createLink('testcase', 'edit', "caseID=$case->id"), $lang->testcase->buttonEdit); + if(common::hasPriv('testcase', 'browse')) echo html::a($this->createLink('testcase', 'browse', "productID=$case->product"), $lang->testcase->buttonToList); ?>
    - case->legendSteps;?> + testcase->legendSteps;?>
    steps);?>