From 43d88caed4760fd174588295d5c5407bfb5a42c9 Mon Sep 17 00:00:00 2001 From: xia0ta0 Date: Mon, 29 Jul 2013 13:54:38 +0800 Subject: [PATCH 1/5] * code for task#1589. --- module/productplan/lang/en.php | 5 +++-- module/productplan/lang/zh-cn.php | 5 +++-- module/productplan/view/linkbug.html.php | 2 +- module/productplan/view/linkstory.html.php | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php index c5d9588d69..ecb0f65f90 100644 --- a/module/productplan/lang/en.php +++ b/module/productplan/lang/en.php @@ -16,15 +16,16 @@ $lang->productplan->create = "Create"; $lang->productplan->edit = "Edit"; $lang->productplan->delete = "Delete"; $lang->productplan->view = "Info"; +$lang->productplan->batchUnlink = "Batch Remove"; $lang->productplan->linkStory = "Link story"; $lang->productplan->unlinkStory = "Remove story"; -$lang->productplan->batchUnlinkStory = "Batch Remove"; +$lang->productplan->batchUnlinkStory = "Batch Remove Stories"; $lang->productplan->linkedStories = 'Stories linked'; $lang->productplan->unlinkedStories = 'Stories unlinked'; $lang->productplan->linkBug = "Link bug"; $lang->productplan->unlinkBug = "Remove bug"; -$lang->productplan->batchUnlinkBug = "Batch Remove"; +$lang->productplan->batchUnlinkBug = "Batch Remove Bugs"; $lang->productplan->linkedBugs = 'Bugs linked'; $lang->productplan->unlinkedBugs = 'Bugs unlinked'; diff --git a/module/productplan/lang/zh-cn.php b/module/productplan/lang/zh-cn.php index 155f5246dd..fe2824ea38 100644 --- a/module/productplan/lang/zh-cn.php +++ b/module/productplan/lang/zh-cn.php @@ -16,15 +16,16 @@ $lang->productplan->create = "创建计划"; $lang->productplan->edit = "编辑计划"; $lang->productplan->delete = "删除计划"; $lang->productplan->view = "计划详情"; +$lang->productplan->batchUnlink = "批量移除"; $lang->productplan->linkStory = "关联需求"; $lang->productplan->unlinkStory = "移除需求"; -$lang->productplan->batchUnlinkStory = "批量移除"; +$lang->productplan->batchUnlinkStory = "批量移除需求"; $lang->productplan->linkedStories = '已关联需求列表'; $lang->productplan->unlinkedStories = '未关联需求列表'; $lang->productplan->linkBug = "关联Bug"; $lang->productplan->unlinkBug = "移除Bug"; -$lang->productplan->batchUnlinkBug = "批量移除"; +$lang->productplan->batchUnlinkBug = "批量移除Bug"; $lang->productplan->linkedBugs = '已关联Bug列表'; $lang->productplan->unlinkedBugs = '未关联Bug列表'; diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php index 5d78ca6c7e..66a35c0806 100644 --- a/module/productplan/view/linkbug.html.php +++ b/module/productplan/view/linkbug.html.php @@ -95,7 +95,7 @@ productplan->batchUnlinkBug); + echo html::submitButton($lang->productplan->batchUnlink); ?> diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php index 18e440f846..02f18265a4 100644 --- a/module/productplan/view/linkstory.html.php +++ b/module/productplan/view/linkstory.html.php @@ -103,7 +103,7 @@ productplan->batchUnlinkStory); + echo html::submitButton($lang->productplan->batchUnlink); ?> From cbb533f0b84aac1ffe35bc8aa894df4a6d1e47c8 Mon Sep 17 00:00:00 2001 From: xia0ta0 Date: Mon, 29 Jul 2013 14:20:59 +0800 Subject: [PATCH 2/5] * code for task#1598. --- module/testcase/control.php | 8 +++++--- module/testcase/view/view.html.php | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/module/testcase/control.php b/module/testcase/control.php index 7365bd7bef..ac1d2a8663 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -323,12 +323,13 @@ class testcase extends control /** * View a test case. * - * @param int $caseID - * @param int $version + * @param int $caseID + * @param int $version + * @param string $from * @access public * @return void */ - public function view($caseID, $version = 0) + public function view($caseID, $version = 0, $from = 'testcase') { $case = $this->testcase->getById($caseID, $version); if(!$case) die(js::error($this->lang->notFound) . js::locate('back')); @@ -341,6 +342,7 @@ class testcase extends control $this->view->position[] = $this->lang->testcase->view; $this->view->case = $case; + $this->view->from = $from; $this->view->version = $version ? $version : $case->version; $this->view->productName = $this->products[$productID]; $this->view->modulePath = $this->tree->getParents($case->module); diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index 370528758d..f8211b1bf1 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -174,7 +174,7 @@ testcase->statusList[$case->status]; - if($case->version > $case->currentVersion) + if($case->version > $case->currentVersion and $from == 'testtask') { echo " ({$lang->testcase->changed} "; echo html::a($this->createLink('testcase', 'confirmchange', "caseID=$case->id"), $lang->confirm, 'hiddenwin'); From 252b1d98d731f9153a05b1a9a5c97a8122886b4e Mon Sep 17 00:00:00 2001 From: xia0ta0 Date: Mon, 29 Jul 2013 14:30:36 +0800 Subject: [PATCH 3/5] * code for task#1598. --- module/testtask/view/cases.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php index 164310d44a..4393369b03 100644 --- a/module/testtask/view/cases.html.php +++ b/module/testtask/view/cases.html.php @@ -76,7 +76,7 @@ var moduleID = ''; case);?> pri?>'>pri?> - createLink('testcase', 'view', "caseID=$run->case&version=$run->version"), $run->title, '_blank');?> + createLink('testcase', 'view', "caseID=$run->case&version=$run->version&from=testtask"), $run->title, '_blank');?> testcase->typeList[$run->type];?> assignedTo]; echo substr($assignedTo, strpos($assignedTo, ':') + 1);?> From b4d7729478bcf80e0b547babe518527c47c2dd64 Mon Sep 17 00:00:00 2001 From: xia0ta0 Date: Mon, 29 Jul 2013 14:31:18 +0800 Subject: [PATCH 4/5] * code for task#1589. --- module/group/lang/resource.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 85902b5ed9..57f7420a21 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -185,6 +185,9 @@ $lang->resource->productplan->view = 'view'; $lang->resource->productplan->linkStory = 'linkStory'; $lang->resource->productplan->unlinkStory = 'unlinkStory'; $lang->resource->productplan->batchUnlinkStory = 'batchUnlinkStory'; +$lang->resource->productplan->linkBug = 'linkBug'; +$lang->resource->productplan->unlinkBug = 'unlinkBug'; +$lang->resource->productplan->batchUnlinkBug = 'batchUnlinkBug'; $lang->productplan->methodOrder[5] = 'browse'; $lang->productplan->methodOrder[10] = 'create'; @@ -194,6 +197,9 @@ $lang->productplan->methodOrder[25] = 'view'; $lang->productplan->methodOrder[30] = 'linkStory'; $lang->productplan->methodOrder[35] = 'unlinkStory'; $lang->productplan->methodOrder[40] = 'batchUnlinkStory'; +$lang->productplan->methodOrder[45] = 'linkBug'; +$lang->productplan->methodOrder[50] = 'unlinkBug'; +$lang->productplan->methodOrder[55] = 'batchUnlinkBug'; /* Release. */ $lang->resource->release = new stdclass(); From 8734221200383da149b2454643c410d2f0654e2e Mon Sep 17 00:00:00 2001 From: xia0ta0 Date: Mon, 29 Jul 2013 15:10:06 +0800 Subject: [PATCH 5/5] * code for task#1589. --- module/productplan/control.php | 19 ++++----- module/productplan/lang/en.php | 19 ++++----- module/productplan/lang/zh-cn.php | 19 ++++----- module/productplan/view/browse.html.php | 2 +- module/productplan/view/view.html.php | 52 ++++++++++++++++++++++++- 5 files changed, 81 insertions(+), 30 deletions(-) diff --git a/module/productplan/control.php b/module/productplan/control.php index 90742a28fe..193374c62a 100644 --- a/module/productplan/control.php +++ b/module/productplan/control.php @@ -140,15 +140,16 @@ class productplan extends control $plan = $this->productplan->getByID($planID, true); if(!$plan) die(js::error($this->lang->notFound) . js::locate('back')); $this->commonAction($plan->product); - $products = $this->product->getPairs(); - $this->view->title = "PLAN #$plan->id $plan->title/" . $products[$plan->product]; - $this->view->position[] = $this->lang->productplan->view; - $this->view->planStories= $this->loadModel('story')->getPlanStories($planID); - $this->view->products = $products; - $this->view->summary = $this->product->summary($this->view->planStories); - $this->view->plan = $plan; - $this->view->actions = $this->loadModel('action')->getList('productplan', $planID); - $this->view->users = $this->loadModel('user')->getPairs('noletter'); + $products = $this->product->getPairs(); + $this->view->title = "PLAN #$plan->id $plan->title/" . $products[$plan->product]; + $this->view->position[] = $this->lang->productplan->view; + $this->view->planStories = $this->loadModel('story')->getPlanStories($planID); + $this->view->planBugs = $this->loadModel('bug')->getPlanBugs($planID); + $this->view->products = $products; + $this->view->summary = $this->product->summary($this->view->planStories); + $this->view->plan = $plan; + $this->view->actions = $this->loadModel('action')->getList('productplan', $planID); + $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->display(); } diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php index ecb0f65f90..cefdb0e880 100644 --- a/module/productplan/lang/en.php +++ b/module/productplan/lang/en.php @@ -9,13 +9,16 @@ * @version $Id: en.php 4659 2013-04-17 06:45:08Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ -$lang->productplan->common = 'Plan'; -$lang->productplan->browse = "Browse"; -$lang->productplan->index = "Index"; -$lang->productplan->create = "Create"; -$lang->productplan->edit = "Edit"; -$lang->productplan->delete = "Delete"; -$lang->productplan->view = "Info"; +$lang->productplan->common = 'Plan'; +$lang->productplan->browse = "Browse"; +$lang->productplan->index = "Index"; +$lang->productplan->create = "Create"; +$lang->productplan->edit = "Edit"; +$lang->productplan->delete = "Delete"; +$lang->productplan->view = "Info"; +$lang->productplan->bugSummary = "Total %s bugs in this page"; +$lang->productplan->basicInfo = 'Basic Info'; + $lang->productplan->batchUnlink = "Batch Remove"; $lang->productplan->linkStory = "Link story"; $lang->productplan->unlinkStory = "Remove story"; @@ -33,8 +36,6 @@ $lang->productplan->confirmDelete = "Are you sure to delete this plan?"; $lang->productplan->confirmUnlinkStory = "Are you sure to remove this story?"; $lang->productplan->confirmUnlinkBug = "Are you sure to remove this bug?"; -$lang->productplan->basicInfo ='Basic Info'; - $lang->productplan->id = 'ID'; $lang->productplan->product = 'Product'; $lang->productplan->title = 'Title'; diff --git a/module/productplan/lang/zh-cn.php b/module/productplan/lang/zh-cn.php index fe2824ea38..a7ba98e84b 100644 --- a/module/productplan/lang/zh-cn.php +++ b/module/productplan/lang/zh-cn.php @@ -9,13 +9,16 @@ * @version $Id: zh-cn.php 4659 2013-04-17 06:45:08Z chencongzhi520@gmail.com $ * @link http://www.zentao.net */ -$lang->productplan->common = '产品计划'; -$lang->productplan->browse = "浏览计划"; -$lang->productplan->index = "计划列表"; -$lang->productplan->create = "创建计划"; -$lang->productplan->edit = "编辑计划"; -$lang->productplan->delete = "删除计划"; -$lang->productplan->view = "计划详情"; +$lang->productplan->common = '产品计划'; +$lang->productplan->browse = "浏览计划"; +$lang->productplan->index = "计划列表"; +$lang->productplan->create = "创建计划"; +$lang->productplan->edit = "编辑计划"; +$lang->productplan->delete = "删除计划"; +$lang->productplan->view = "计划详情"; +$lang->productplan->bugSummary = "本页共 %s 个Bug"; +$lang->productplan->basicInfo = '基本信息'; + $lang->productplan->batchUnlink = "批量移除"; $lang->productplan->linkStory = "关联需求"; $lang->productplan->unlinkStory = "移除需求"; @@ -33,8 +36,6 @@ $lang->productplan->confirmDelete = "您确认删除该计划吗？"; $lang->productplan->confirmUnlinkStory = "您确认移除该需求吗？"; $lang->productplan->confirmUnlinkBug = "您确认移除该Bug吗？"; -$lang->productplan->basicInfo ='基本信息'; - $lang->productplan->id = '编号'; $lang->productplan->product = '产品'; $lang->productplan->title = '名称'; diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php index 7b14b34c88..462548f61b 100644 --- a/module/productplan/view/browse.html.php +++ b/module/productplan/view/browse.html.php @@ -37,8 +37,8 @@ end;?> id", '', 'list'); common::printIcon('productplan', 'linkStory', "planID=$plan->id", '', 'list'); + common::printIcon('productplan', 'linkBug', "planID=$plan->id", '', 'list'); common::printIcon('productplan', 'edit', "planID=$plan->id", '', 'list'); common::printIcon('productplan', 'delete', "planID=$plan->id", '', 'list', '', 'hiddenwin'); ?> diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php index 05edbb6f15..1d508aee15 100644 --- a/module/productplan/view/view.html.php +++ b/module/productplan/view/view.html.php @@ -27,8 +27,8 @@ $browseLink = $this->session->productPlanList ? $this->session->productPlanList : inlink('browse', "planID=$plan->id"); if(!$plan->deleted) { - common::printIcon('productplan', 'linkBug', "planID=$plan->id"); common::printIcon('productplan', 'linkStory',"planID=$plan->id"); + common::printIcon('productplan', 'linkBug', "planID=$plan->id"); common::printIcon('productplan', 'edit', "planID=$plan->id"); common::printIcon('productplan', 'delete', "planID=$plan->id", '', 'button', '', 'hiddenwin'); } @@ -109,7 +109,7 @@ if(count($planStories) and $canBatchUnlink) { echo html::selectAll() . html::selectReverse(); - echo html::submitButton($lang->productplan->batchUnlinkStory); + echo html::submitButton($lang->productplan->batchUnlink); } ?> @@ -119,4 +119,52 @@ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
title .$lang->colon . $lang->productplan->linkedBugs;?>
idAB;?> priAB;?> bug->title;?> openedByAB;?> assignedToAB;?>statusAB;?>actions?>
+ + + + createLink('bug', 'view', "bugID=$bug->id"), sprintf("%03d", $bug->id));?> + pri?>'>pri;?>createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?>openedBy];?>assignedTo];?>bug->statusList[$bug->status];?>id", '', 'list', '', 'hiddenwin');?>
+
+ productplan->batchUnlink); + ?> +
+
productplan->bugSummary, count($planStories));?>
+
+