diff --git a/module/common/model.php b/module/common/model.php index bcc5a38ed1..128e6330c2 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -1238,6 +1238,7 @@ eof; } if($module == 'product' and $method == 'browse' and !empty($this->app->params['storyType']) and $this->app->params['storyType'] != 'story') $method = $this->app->params['storyType']; + if($module == 'productplan' && ($method == 'story' || $method == 'bug')) $method = 'view;' $openMethods = array( 'user' => array('deny', 'logout'), diff --git a/module/doc/config.php b/module/doc/config.php index f782ac688d..24e4d95dab 100644 --- a/module/doc/config.php +++ b/module/doc/config.php @@ -129,16 +129,16 @@ $config->doc->zentaoList['bug'] = array('key' => 'bug', 'name' => $lang->doc $config->doc->zentaoList['task'] = array('key' => 'task', 'name' => $lang->doc->zentaoList['task'] . $lang->doc->list, 'icon' => 'check-sign', 'module' => 'execution', 'method' => 'task', 'params' => 'execution=0&status=unclosed¶m=0&orderBy=&recTotal=0&recPerPage=100&pageID=1&from=doc', 'priv' => 'taskBrowse'); $config->doc->zentaoList['more'] = array('key' => 'more', 'name' => $lang->doc->zentaoList['more'] . $lang->doc->list, 'icon' => 'ellipsis-v', 'subMenu' => array()); -$config->doc->zentaoList['story']['subMenu'][] = array('key' => 'productStory', 'name' => $lang->doc->zentaoList['productStory'] . $lang->doc->list, 'icon' => 'lightbulb-alt', 'module' => 'product', 'method' => 'browse', 'params' => 'productID=0&branch=all&browseType=¶m=0&storyType=story&orderBy=&recTotal=0&recPerPage=20&pageID=1&projectID=0&from=doc'); +$config->doc->zentaoList['story']['subMenu'][] = array('key' => 'productStory', 'name' => $lang->doc->zentaoList['productStory'] . $lang->doc->list, 'icon' => 'lightbulb-alt', 'module' => 'product', 'method' => 'browse', 'params' => 'productID=0&branch=all&browseType=¶m=0&storyType=story&orderBy=&recTotal=0&recPerPage=20&pageID=1&projectID=0&from=doc', 'priv' => 'storyBrowse'); //$config->doc->zentaoList['story']['subMenu'][] = array('key' => 'projectStory', 'name' => $lang->doc->zentaoList['projectStory'] . $lang->doc->list, 'icon' => 'project', 'module' => 'product', 'method' => 'browse', 'params' => ''); -$config->doc->zentaoList['story']['subMenu'][] = array('key' => 'executionStory', 'name' => $lang->doc->zentaoList['executionStory'] . $lang->doc->list, 'icon' => 'run', 'module' => 'execution', 'method' => 'story', 'params' => 'executionID=0&storyType=story&orderBy=&type=all¶m=0&recTotal=0&recPerPage=20&pageID=1&from=doc'); -$config->doc->zentaoList['story']['subMenu'][] = array('key' => 'planStory', 'name' => $lang->doc->zentaoList['planStory'] . $lang->doc->list, 'icon' => 'productplan', 'module' => 'productplan', 'method' => 'story', 'params' => 'productID=0&planID=0&blockID=0'); +$config->doc->zentaoList['story']['subMenu'][] = array('key' => 'executionStory', 'name' => $lang->doc->zentaoList['executionStory'] . $lang->doc->list, 'icon' => 'run', 'module' => 'execution', 'method' => 'story', 'params' => 'executionID=0&storyType=story&orderBy=&type=all¶m=0&recTotal=0&recPerPage=20&pageID=1&from=doc', 'priv' => 'executionStory'); +$config->doc->zentaoList['story']['subMenu'][] = array('key' => 'planStory', 'name' => $lang->doc->zentaoList['planStory'] . $lang->doc->list, 'icon' => 'productplan', 'module' => 'productplan', 'method' => 'story', 'params' => 'productID=0&planID=0&blockID=0', 'priv' => 'productplanView'); $config->doc->zentaoList['case']['subMenu'][] = array('key' => 'productCase', 'name' => $lang->doc->zentaoList['productCase'] . $lang->doc->list, 'icon' => 'lightbulb-alt', 'module' => 'testcase', 'method' => 'browse', 'params' => 'productID=0&branch=&browseType=all¶m=0&caseType=&orderBy=sort_asc,id_desc&recTotal=0&recPerPage=20&pageID=0&projectID=0&from=doc'); $config->doc->zentaoList['case']['subMenu'][] = array('key' => 'caselib', 'name' => $lang->doc->zentaoList['caselib'] . $lang->doc->list, 'icon' => 'usecase', 'module' => 'caselib', 'method' => 'browse', 'params' => 'libID=0&browseType=all¶m=0&orderBy=id_desc&recTotal=0&recPerPage=20&pageID=1&from=doc', 'priv' => 'caselibBrowse'); $config->doc->zentaoList['bug']['subMenu'][] = array('key' => 'productBug', 'name' => $lang->doc->zentaoList['productBug'] . $lang->doc->list, 'icon' => 'lightbulb-alt', 'module' => 'bug', 'method' => 'browse', 'params' => 'productID=0&branch=&browseType=¶m=0&orderBy=&recTotal=0&recPerPage=20&pageID=1&from=doc'); -$config->doc->zentaoList['bug']['subMenu'][] = array('key' => 'planBug', 'name' => $lang->doc->zentaoList['planBug'] . $lang->doc->list, 'icon' => 'productplan', 'module' => 'productplan', 'method' => 'bug', 'params' => 'productID=0&planID=0&blockID=0'); +$config->doc->zentaoList['bug']['subMenu'][] = array('key' => 'planBug', 'name' => $lang->doc->zentaoList['planBug'] . $lang->doc->list, 'icon' => 'productplan', 'module' => 'productplan', 'method' => 'bug', 'params' => 'productID=0&planID=0&blockID=0', 'priv' => 'productplanView'); $config->doc->zentaoList['more']['subMenu'][] = array('key' => 'productPlan', 'name' => $lang->doc->zentaoList['productPlan'] . $lang->doc->list, 'icon' => 'productplan', 'module' => 'productplan', 'method' => 'browse', 'params' => 'productID=0&branch=&browseType=undone&queryID=0&orderBy=begin_desc&recTotal=0&recPerPage=20&pageID=1&from=doc', 'priv' => 'productplanBrowse'); //$config->doc->zentaoList['more']['subMenu'][] = array('key' => 'productRelease', 'name' => $lang->doc->zentaoList['productRelease'] . $lang->doc->list, 'icon' => 'send', 'module' => 'product', 'method' => 'browse', 'params' => '', 'priv' => 'releaseBrowse');