diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 9fe95ffa19..f895ba0801 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -140,7 +140,7 @@ $lang->my->menu->todo = array('link' => 'Todo|my|todo|', 'subModule' = $lang->my->menu->task = array('link' => 'Task|my|task|', 'subModule' => 'task'); $lang->my->menu->bug = array('link' => 'Bug|my|bug|', 'subModule' => 'bug'); $lang->my->menu->testtask = array('link' => 'Test|my|testtask|', 'subModule' => 'testcase,testtask', 'alias' => 'testcase'); -$lang->my->menu->story = 'Story|my|story|'; +$lang->my->menu->story = array('link' => 'Story|my|story|', 'subModule' => 'story'); $lang->my->menu->myProject = 'Project|my|project|'; $lang->my->menu->dynamic = 'Dynamic|my|dynamic|'; $lang->my->menu->profile = array('link' => 'Profile|my|profile|', 'alias' => 'editprofile'); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 6db61c36f7..4fc04c8f94 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -140,7 +140,7 @@ $lang->my->menu->todo = array('link' => '待办|my|todo|', 'subModule' $lang->my->menu->task = array('link' => '任务|my|task|', 'subModule' => 'task'); $lang->my->menu->bug = array('link' => 'Bug|my|bug|', 'subModule' => 'bug'); $lang->my->menu->testtask = array('link' => '测试|my|testtask|', 'subModule' => 'testcase,testtask', 'alias' => 'testcase'); -$lang->my->menu->story = '需求|my|story|'; +$lang->my->menu->story = array('link' => '需求|my|story|', 'subModule' => 'story'); $lang->my->menu->myProject = '项目|my|project|'; $lang->my->menu->dynamic = '动态|my|dynamic|'; $lang->my->menu->profile = array('link' => '档案|my|profile|', 'alias' => 'editprofile'); diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php index 9ee25e3fb9..f2efaeacf3 100644 --- a/module/my/view/story.html.php +++ b/module/my/view/story.html.php @@ -22,6 +22,7 @@ ?> +
diff --git a/module/story/control.php b/module/story/control.php index f8309b3170..331d0f8c25 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -319,7 +319,7 @@ class story extends control $stories = $this->dao->select('*')->from(TABLE_STORY)->where('id')->in($storyIDList)->fetchAll('id'); /* The stories of a product. */ - if(!$projectID) + if($productID and !$projectID) { $this->product->setMenu($this->product->getPairs('nodeleted'), $productID); $product = $this->product->getByID($productID); @@ -327,7 +327,7 @@ class story extends control } /* The stories of a project. */ - else + elseif($productID and $projectID) { $this->lang->story->menu = $this->lang->project->menu; $this->project->setMenu($this->project->getPairs('nodeleted'), $projectID); @@ -336,6 +336,15 @@ class story extends control $project = $this->project->getByID($projectID); $this->view->title = $project->name . $this->lang->colon . $this->lang->story->batchEdit; } + /* The stories of my. */ + elseif(!$productID and !$projectID) + { + $this->lang->story->menu = $this->lang->my->menu; + $this->lang->set('menugroup.story', 'my'); + $this->lang->story->menuOrder = $this->lang->my->menuOrder; + $this->loadModel('my')->setMenu(); + $this->view->title = $this->lang->story->batchEdit; + } /* Get the module and productplan of edited stories. */ $moduleOptionMenus = array(); @@ -361,7 +370,6 @@ class story extends control $this->view->productID = $productID; $this->view->storyIDList = $storyIDList; $this->view->stories = $stories; - $this->display(); }