diff --git a/module/bug/control.php b/module/bug/control.php index 78658324be..fd4ad927db 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -507,12 +507,27 @@ class bug extends control $bugIDList = $this->post->bugIDList ? $this->post->bugIDList : die(js::locate($this->session->bugList, 'parent')); + /* The bugs of a product. */ + if($productID) + { + $product = $this->product->getByID($productID); + + /* Set product menu. */ + $this->bug->setMenu($this->products, $productID); + $this->view->title = $product->name . $this->lang->colon . $this->lang->bug->batchEdit; + $this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]); + } + /* The bugs of my. */ + else + { + $this->lang->bug->menu = $this->lang->my->menu; + $this->lang->set('menugroup.bug', 'my'); + $this->lang->bug->menuOrder = $this->lang->my->menuOrder; + $this->loadModel('my')->setMenu(); + $this->view->title = $this->lang->bug->batchEdit; + } /* Initialize vars.*/ $bugs = $this->dao->select('*')->from(TABLE_BUG)->where('id')->in($bugIDList)->fetchAll('id'); - $product = $this->product->getByID($productID); - - /* Set product menu. */ - $this->bug->setMenu($this->products, $productID); /* Judge whether the editedTasks is too large and set session. */ $showSuhosinInfo = false; @@ -521,8 +536,6 @@ class bug extends control if($showSuhosinInfo) $this->view->suhosinInfo = $this->lang->suhosinInfo; /* Assign. */ - $this->view->title = $product->name . $this->lang->colon . $this->lang->bug->batchEdit; - $this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]); $this->view->position[] = $this->lang->bug->common; $this->view->position[] = $this->lang->bug->batchEdit; $this->view->bugIDList = $bugIDList; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 46651c9ff5..7167cf90db 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -138,7 +138,7 @@ $lang->my->menu->account = ' %s' . $lang->arr $lang->my->menu->index = 'Index|my|index'; $lang->my->menu->todo = array('link' => 'Todo|my|todo|', 'subModule' => 'todo'); $lang->my->menu->task = array('link' => 'Task|my|task|', 'subModule' => 'task'); -$lang->my->menu->bug = 'Bug|my|bug|'; +$lang->my->menu->bug = array('link' => 'Bug|my|bug|', 'subModule' => 'bug'); $lang->my->menu->testtask = array('link' => 'Test|my|testtask|', 'alias' => 'testcase'); $lang->my->menu->story = 'Story|my|story|'; $lang->my->menu->myProject = 'Project|my|project|'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 94fe41e584..d0030eb613 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -138,7 +138,7 @@ $lang->my->menu->account = ' %s' . $lang->arr $lang->my->menu->index = '首页|my|index'; $lang->my->menu->todo = array('link' => '待办|my|todo|', 'subModule' => 'todo'); $lang->my->menu->task = array('link' => '任务|my|task|', 'subModule' => 'task'); -$lang->my->menu->bug = 'Bug|my|bug|'; +$lang->my->menu->bug = array('link' => 'Bug|my|bug|', 'subModule' => 'bug'); $lang->my->menu->testtask = array('link' => '测试|my|testtask|', 'alias' => 'testcase'); $lang->my->menu->story = '需求|my|story|'; $lang->my->menu->myProject = '项目|my|project|'; diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php index c0fa0c7182..9ad2f17b66 100644 --- a/module/my/view/bug.html.php +++ b/module/my/view/bug.html.php @@ -23,6 +23,7 @@ recTotal}&recPerPage={$pager->recPerPage}"; ?> +
'> @@ -39,9 +40,13 @@ + - + @@ -62,7 +67,17 @@ - + + +
createLink('bug', 'view', "bugID=$bug->id"), $bug->id, '_blank');?> + + createLink('bug', 'view', "bugID=$bug->id"), sprintf('%03d', $bug->id), '_blank');?> + bug->severityList[$bug->severity]?>'>bug->severityList[$bug->severity]) ? $lang->bug->severityList[$bug->severity] : $bug->severity;?> bug->priList[$bug->pri]?>'>bug->priList[$bug->pri]) ? $lang->bug->priList[$bug->pri] : $bug->pri?> bug->typeList[$bug->type]?>
show();?>
+ +
+ edit);?> +
+ + show();?> +
+