From 417cc0d800077df8ed42cfaf473b3884e82ce0cd Mon Sep 17 00:00:00 2001 From: hufangzhou <746775970@qq.com> Date: Thu, 17 Dec 2020 08:45:26 +0800 Subject: [PATCH] * Finish task#8661. --- module/story/control.php | 14 +++++++++----- module/story/view/batchedit.html.php | 1 + 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/module/story/control.php b/module/story/control.php index 6af39fe1ad..292144e269 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -627,18 +627,21 @@ class story extends control $this->view->position[] = html::a($this->createLink('product', 'browse', "product=$product->id&branch=$branch"), $product->name); $this->view->title = $product->name . $this->lang->colon . $this->lang->story->batchEdit; } - /* The stories of a project. */ elseif($projectID) { - unset($this->lang->product->menu->branch); + /* The stories of a project. */ + $this->lang->navGroup->story = 'project'; + $moduleIndex = array_search('story', $this->lang->noMenuModule); + unset($this->lang->noMenuModule[$moduleIndex]); $this->lang->story->menu = $this->lang->project->menu; + $this->project->setMenu($this->project->getExecutionPairs($this->session->PRJ, 'all', 'nodeleted'), $projectID); $this->lang->set('menugroup.story', 'project'); $this->lang->story->menuOrder = $this->lang->project->menuOrder; $project = $this->project->getByID($projectID); - $branchProduct = false; + $branchProduct = false; $linkedProducts = $this->project->getProducts($projectID); foreach($linkedProducts as $linkedProduct) { @@ -649,8 +652,9 @@ class story extends control } } - $this->view->position[] = html::a($this->createLink('project', 'story', "project=$project->id"), $project->name); - $this->view->title = $project->name . $this->lang->colon . $this->lang->story->batchEdit; + $this->view->position[] = html::a($this->createLink('project', 'story', "project=$project->id"), $project->name); + $this->view->title = $project->name . $this->lang->colon . $this->lang->story->batchEdit; + $this->view->resetActive = true; } /* The stories of my. */ else diff --git a/module/story/view/batchedit.html.php b/module/story/view/batchedit.html.php index 2c306ad1a9..2d12c66db9 100644 --- a/module/story/view/batchedit.html.php +++ b/module/story/view/batchedit.html.php @@ -13,6 +13,7 @@ lang->story->dittoNotice);?> +