diff --git a/lib/zin/wg/dropmenu/v1.php b/lib/zin/wg/dropmenu/v1.php index 481502b971..bc707ff593 100644 --- a/lib/zin/wg/dropmenu/v1.php +++ b/lib/zin/wg/dropmenu/v1.php @@ -94,7 +94,7 @@ class dropmenu extends wg if($module == 'testcase' && in_array($method, array('view', 'edit')) && data('isLibCase')) $tab = 'caselib'; - if(strpos(',story-create,story-batchcreate,product-browse,', ",$module-$method,") !== false) $extra = data('storyType'); + if(strpos(',story-create,story-batchcreate,product-browse,projectstory-story,', ",$module-$method,") !== false) $extra = data('storyType'); if($tab == 'dimension' && $module == 'tree' && $method == 'browsegroup') $extra = data('viewType'); diff --git a/module/project/config.php b/module/project/config.php index 361b435ec9..e3568e75d3 100755 --- a/module/project/config.php +++ b/module/project/config.php @@ -226,7 +226,7 @@ $config->project->linkMap->product = array(); $config->project->linkMap->product['showerrornone'] = array('projectstory', 'story', 'projectID=%s', ''); $config->project->linkMap->projectstory = array(); -$config->project->linkMap->projectstory['story'] = array('', '', 'projectID=%s', ''); +$config->project->linkMap->projectstory['story'] = array('', '', 'projectID=%s&productID=0&branch=0&browseType=¶m=0&storyType={extra}', ''); $config->project->linkMap->projectstory['linkstory'] = array('', '', 'projectID=%s', ''); $config->project->linkMap->projectstory['track'] = array('', '', 'projectID=%s', ''); diff --git a/module/project/control.php b/module/project/control.php index 37b5e8836d..62bf71279f 100755 --- a/module/project/control.php +++ b/module/project/control.php @@ -95,7 +95,7 @@ class project extends control * @access public * @return void */ - public function ajaxGetDropMenu(int $projectID, string $module, string $method) + public function ajaxGetDropMenu(int $projectID, string $module, string $method, string $extra = '') { /* Set cookie for show all project. */ $_COOKIE['showClosed'] = 1; @@ -114,7 +114,7 @@ class project extends control $orderedProjects[$project->parent][] = $project; } - $this->view->link = $this->project->getProjectLink($module, $method, $projectID); // Create the link from module,method. + $this->view->link = $this->project->getProjectLink($module, $method, $projectID, $extra); // Create the link from module,method. $this->view->projectID = $projectID; $this->view->projects = $orderedProjects; $this->view->module = $module; diff --git a/module/project/model.php b/module/project/model.php index 2e12f359d1..788a5732fd 100755 --- a/module/project/model.php +++ b/module/project/model.php @@ -477,7 +477,7 @@ class projectModel extends model * @access public * @return string */ - public function getProjectLink(string $module, string $method, int $projectID) :string + public function getProjectLink(string $module, string $method, int $projectID, string $extra = '') :string { $link = helper::createLink('project', 'index', "projectID=%s"); @@ -498,6 +498,7 @@ class projectModel extends model $linkParams = $this->config->project->linkMap->$module[$method]; if(!$linkParams[0]) $linkParams[0] = $module; if(!$linkParams[1]) $linkParams[1] = $method; + if(strpos($linkParams[2], '{extra}') !== false) $linkParams[2] = str_replace('{extra}', $extra, $linkParams[2]); return helper::createLink($linkParams[0], $linkParams[1], $linkParams[2]) . $linkParams[3]; }