From 672dde69b828f704d0e36ba9264dd514ede42994 Mon Sep 17 00:00:00 2001
From: hufangzhou <746775970@qq.com>
Date: Mon, 25 Jan 2021 15:48:55 +0800
Subject: [PATCH] * Finish task#9088.
---
module/common/lang/de.php | 8 ++--
module/common/lang/en.php | 8 ++--
module/common/lang/fr.php | 8 ++--
module/common/lang/menuOrder.php | 15 +++----
module/common/lang/vi.php | 8 ++--
module/common/lang/zh-cn.php | 8 ++--
module/common/lang/zh-tw.php | 8 ++--
module/product/control.php | 65 +++++++++++++++--------------
module/product/view/browse.html.php | 13 ++++++
module/projectstory/control.php | 3 +-
module/story/js/track.js | 2 +-
11 files changed, 74 insertions(+), 72 deletions(-)
diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 52655672dd..aa22eb1def 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -946,9 +946,10 @@ $lang->menu->waterfall->programplan = array('link' => 'Plan|programplan|brows
$lang->menu->waterfall->project = array('link' => $lang->executionCommon . '|project|task|projectID={PROJECT}', 'subModule' => ',project,task,');
$lang->menu->waterfall->doc = array('link' => 'Doc|doc|index|program={PROJECT}');
$lang->menu->waterfall->weekly = array('link' => 'Weekly|weekly|index|program={PROJECT}', 'subModule' => ',milestone,');
-$lang->menu->waterfall->projectstory = array('link' => 'Story|projectstory|story', 'alias' => 'story,track');
+$lang->menu->waterfall->projectstory = array('link' => 'Story|projectstory|story', 'alias' => 'story');
$lang->menu->waterfall->design = 'Design|design|browse|product={PRODUCT}';
$lang->menu->waterfall->ci = 'Code|repo|browse|';
+$lang->menu->waterfall->track = 'Track|projectstory|track';
$lang->menu->waterfall->qa = 'Index|qa|index';
$lang->menu->waterfall->projectrelease = array('link' => 'Release|projectrelease|browse');
$lang->menu->waterfall->projectbuild = array('link' => 'Build|projectbuild|browse|project={PROJECT}');
@@ -1014,9 +1015,6 @@ $lang->stakeholder->menu->issue = array('link' => 'Issue|stakeholder|issue|');
$lang->programplan->menu->gantt = array('link' => 'Gantt|programplan|browse|programID={PROJECT}&productID={PRODUCT}&type=gantt');
$lang->programplan->menu->lists = array('link' => 'Stage|programplan|browse|programID={PROJECT}&productID={PRODUCT}&type=lists', 'alias' => 'create');
-$lang->projectstory->menu->story = array('link' => "{$lang->SRCommon}|projectstory|story", 'subModule' => 'story,project', 'alias' => 'linkstory');
-$lang->projectstory->menu->track = array('link' => 'Track|projectstory|track', 'subModule' => '');
-
$lang->design->menu->all = array('link' => 'All|design|browse|productID={PRODUCT}&browseType=all');
$lang->design->menu->hlds = array('link' => 'HLDS|design|browse|productID={PRODUCT}&browseType=HLDS');
$lang->design->menu->dds = array('link' => 'DDS|design|browse|productID={PRODUCT}&browseType=DDS');
@@ -1025,6 +1023,6 @@ $lang->design->menu->ads = array('link' => 'ADS|design|browse|productID={PR
$lang->design->menu->bysearch = array('link' => ' ' . $lang->searchAB . '');
$lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
+$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 6335aa5e18..80041b9dc7 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -946,9 +946,10 @@ $lang->menu->waterfall->programplan = array('link' => 'Plan|programplan|brows
$lang->menu->waterfall->project = array('link' => $lang->executionCommon . '|project|task|projectID={PROJECT}', 'subModule' => ',project,task,');
$lang->menu->waterfall->doc = array('link' => 'Doc|doc|index|program={PROJECT}');
$lang->menu->waterfall->weekly = array('link' => 'Weekly|weekly|index|program={PROJECT}', 'subModule' => ',milestone,');
-$lang->menu->waterfall->projectstory = array('link' => 'Story|projectstory|story', 'alias' => 'story,track');
+$lang->menu->waterfall->projectstory = array('link' => 'Story|projectstory|story', 'alias' => 'story');
$lang->menu->waterfall->design = 'Design|design|browse|product={PRODUCT}';
$lang->menu->waterfall->ci = 'Code|repo|browse|';
+$lang->menu->waterfall->track = 'Track|projectstory|track';
$lang->menu->waterfall->qa = 'Index|qa|index';
$lang->menu->waterfall->projectrelease = array('link' => 'Release|projectrelease|browse');
$lang->menu->waterfall->projectbuild = array('link' => 'Build|projectbuild|browse|project={PROJECT}');
@@ -1014,9 +1015,6 @@ $lang->stakeholder->menu->issue = array('link' => 'Issue|stakeholder|issue|');
$lang->programplan->menu->gantt = array('link' => 'Gantt|programplan|browse|programID={PROJECT}&productID={PRODUCT}&type=gantt');
$lang->programplan->menu->lists = array('link' => 'Stage|programplan|browse|programID={PROJECT}&productID={PRODUCT}&type=lists', 'alias' => 'create');
-$lang->projectstory->menu->story = array('link' => "{$lang->SRCommon}|projectstory|story", 'subModule' => 'story,project', 'alias' => 'linkstory');
-$lang->projectstory->menu->track = array('link' => 'Track|projectstory|track', 'subModule' => '');
-
$lang->design->menu->all = array('link' => 'All|design|browse|productID={PRODUCT}&browseType=all');
$lang->design->menu->hlds = array('link' => 'HLDS|design|browse|productID={PRODUCT}&browseType=HLDS');
$lang->design->menu->dds = array('link' => 'DDS|design|browse|productID={PRODUCT}&browseType=DDS');
@@ -1025,6 +1023,6 @@ $lang->design->menu->ads = array('link' => 'ADS|design|browse|productID={PR
$lang->design->menu->bysearch = array('link' => ' ' . $lang->searchAB . '');
$lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
+$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 95372f2ab7..7f4c068929 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -946,9 +946,10 @@ $lang->menu->waterfall->programplan = array('link' => 'Plan|programplan|brows
$lang->menu->waterfall->project = array('link' => $lang->executionCommon . '|project|task|projectID={PROJECT}', 'subModule' => ',project,task,');
$lang->menu->waterfall->doc = array('link' => 'Doc|doc|index|program={PROJECT}');
$lang->menu->waterfall->weekly = array('link' => 'Weekly|weekly|index|program={PROJECT}', 'subModule' => ',milestone,');
-$lang->menu->waterfall->projectstory = array('link' => 'Story|projectstory|story', 'alias' => 'story,track');
+$lang->menu->waterfall->projectstory = array('link' => 'Story|projectstory|story', 'alias' => 'story');
$lang->menu->waterfall->design = 'Design|design|browse|product={PRODUCT}';
$lang->menu->waterfall->ci = 'Code|repo|browse|';
+$lang->menu->waterfall->track = 'Track|projectstory|track';
$lang->menu->waterfall->qa = 'Index|qa|index';
$lang->menu->waterfall->projectrelease = array('link' => 'Release|projectrelease|browse');
$lang->menu->waterfall->projectbuild = array('link' => 'Build|projectbuild|browse|project={PROJECT}');
@@ -1014,9 +1015,6 @@ $lang->stakeholder->menu->issue = array('link' => 'Issue|stakeholder|issue|');
$lang->programplan->menu->gantt = array('link' => 'Gantt|programplan|browse|programID={PROJECT}&productID={PRODUCT}&type=gantt');
$lang->programplan->menu->lists = array('link' => 'Stage|programplan|browse|programID={PROJECT}&productID={PRODUCT}&type=lists', 'alias' => 'create');
-$lang->projectstory->menu->story = array('link' => "{$lang->SRCommon}|projectstory|story", 'subModule' => 'story,project', 'alias' => 'linkstory');
-$lang->projectstory->menu->track = array('link' => 'Track|projectstory|track', 'subModule' => '');
-
$lang->design->menu->all = array('link' => 'All|design|browse|productID={PRODUCT}&browseType=all');
$lang->design->menu->hlds = array('link' => 'HLDS|design|browse|productID={PRODUCT}&browseType=HLDS');
$lang->design->menu->dds = array('link' => 'DDS|design|browse|productID={PRODUCT}&browseType=DDS');
@@ -1025,6 +1023,6 @@ $lang->design->menu->ads = array('link' => 'ADS|design|browse|productID={PR
$lang->design->menu->bysearch = array('link' => ' ' . $lang->searchAB . '');
$lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
+$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php
index 734a4eba12..a03a11b8f9 100644
--- a/module/common/lang/menuOrder.php
+++ b/module/common/lang/menuOrder.php
@@ -15,13 +15,14 @@ $lang->waterfall->menuOrder[15] = 'project';
$lang->waterfall->menuOrder[20] = 'projectstory';
$lang->waterfall->menuOrder[25] = 'design';
$lang->waterfall->menuOrder[30] = 'ci';
-$lang->waterfall->menuOrder[35] = 'qa';
-$lang->waterfall->menuOrder[40] = 'doc';
-$lang->waterfall->menuOrder[45] = 'projectbuild';
-$lang->waterfall->menuOrder[50] = 'projectrelease';
-$lang->waterfall->menuOrder[55] = 'weekly';
-$lang->waterfall->menuOrder[60] = 'other';
-$lang->waterfall->menuOrder[65] = 'projectsetting';
+$lang->waterfall->menuOrder[35] = 'track';
+$lang->waterfall->menuOrder[40] = 'qa';
+$lang->waterfall->menuOrder[45] = 'doc';
+$lang->waterfall->menuOrder[50] = 'projectbuild';
+$lang->waterfall->menuOrder[55] = 'projectrelease';
+$lang->waterfall->menuOrder[60] = 'weekly';
+$lang->waterfall->menuOrder[65] = 'other';
+$lang->waterfall->menuOrder[70] = 'projectsetting';
$lang->scrum->menuOrder[5] = 'programindex';
$lang->scrum->menuOrder[10] = 'project';
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index 9639c6193b..ab12ade31b 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -946,9 +946,10 @@ $lang->menu->waterfall->programplan = array('link' => 'Plan|programplan|brows
$lang->menu->waterfall->project = array('link' => $lang->executionCommon . '|project|task|projectID={PROJECT}', 'subModule' => ',project,task,');
$lang->menu->waterfall->doc = array('link' => 'Doc|doc|index|program={PROJECT}');
$lang->menu->waterfall->weekly = array('link' => 'Weekly|weekly|index|program={PROJECT}', 'subModule' => ',milestone,');
-$lang->menu->waterfall->projectstory = array('link' => 'Story|projectstory|story', 'alias' => 'story,track');
+$lang->menu->waterfall->projectstory = array('link' => 'Story|projectstory|story', 'alias' => 'story');
$lang->menu->waterfall->design = 'Design|design|browse|product={PRODUCT}';
$lang->menu->waterfall->ci = 'Code|repo|browse|';
+$lang->menu->waterfall->track = 'Track|projectstory|track';
$lang->menu->waterfall->qa = 'Index|qa|index';
$lang->menu->waterfall->projectrelease = array('link' => 'Release|projectrelease|browse');
$lang->menu->waterfall->projectbuild = array('link' => 'Build|projectbuild|browse|project={PROJECT}');
@@ -1014,9 +1015,6 @@ $lang->stakeholder->menu->issue = array('link' => 'Issue|stakeholder|issue|');
$lang->programplan->menu->gantt = array('link' => 'Gantt|programplan|browse|programID={PROJECT}&productID={PRODUCT}&type=gantt');
$lang->programplan->menu->lists = array('link' => 'Stage|programplan|browse|programID={PROJECT}&productID={PRODUCT}&type=lists', 'alias' => 'create');
-$lang->projectstory->menu->story = array('link' => "{$lang->SRCommon}|projectstory|story", 'subModule' => 'story,project', 'alias' => 'linkstory');
-$lang->projectstory->menu->track = array('link' => 'Track|projectstory|track', 'subModule' => '');
-
$lang->design->menu->all = array('link' => 'All|design|browse|productID={PRODUCT}&browseType=all');
$lang->design->menu->hlds = array('link' => 'HLDS|design|browse|productID={PRODUCT}&browseType=HLDS');
$lang->design->menu->dds = array('link' => 'DDS|design|browse|productID={PRODUCT}&browseType=DDS');
@@ -1025,6 +1023,6 @@ $lang->design->menu->ads = array('link' => 'ADS|design|browse|productID={PR
$lang->design->menu->bysearch = array('link' => ' ' . $lang->searchAB . '');
$lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
+$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 65110c51e6..61b11365ae 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -946,9 +946,10 @@ $lang->menu->waterfall->programplan = array('link' => '计划|programplan|bro
$lang->menu->waterfall->project = array('link' => $lang->executionCommon . '|project|task|executionID={EXECUTION}', 'subModule' => ',project,task,');
$lang->menu->waterfall->doc = array('link' => '文档|doc|index|project={PROJECT}');
$lang->menu->waterfall->weekly = array('link' => '报告|weekly|index|project={PROJECT}', 'subModule' => ',milestone,');
-$lang->menu->waterfall->projectstory = array('link' => '需求|projectstory|story', 'alias' => 'story,track');
+$lang->menu->waterfall->projectstory = array('link' => '需求|projectstory|story', 'alias' => 'story');
$lang->menu->waterfall->design = '设计|design|browse|product={PRODUCT}';
$lang->menu->waterfall->ci = '代码|repo|browse|';
+$lang->menu->waterfall->track = '矩阵|projectstory|track';
$lang->menu->waterfall->qa = '测试|qa|index';
$lang->menu->waterfall->projectrelease = array('link' => '发布|projectrelease|browse');
$lang->menu->waterfall->projectbuild = array('link' => '版本|projectbuild|browse|project={PROJECT}');
@@ -1014,9 +1015,6 @@ $lang->stakeholder->menu->issue = array('link' => '问题管理|stakeholder|issu
$lang->programplan->menu->gantt = array('link' => '甘特图|programplan|browse|programID={PROJECT}&productID={PRODUCT}&type=gantt');
$lang->programplan->menu->lists = array('link' => '阶段列表|programplan|browse|programID={PROJECT}&productID={PRODUCT}&type=lists', 'alias' => 'create');
-$lang->projectstory->menu->story = array('link' => "{$lang->SRCommon}|projectstory|story", 'subModule' => 'story,project', 'alias' => 'linkstory');
-$lang->projectstory->menu->track = array('link' => '跟踪矩阵|projectstory|track', 'subModule' => '');
-
$lang->design->menu->all = array('link' => '所有|design|browse|productID={PRODUCT}&browseType=all');
$lang->design->menu->hlds = array('link' => '概要设计|design|browse|productID={PRODUCT}&browseType=HLDS');
$lang->design->menu->dds = array('link' => '详细设计|design|browse|productID={PRODUCT}&browseType=DDS');
@@ -1025,6 +1023,6 @@ $lang->design->menu->ads = array('link' => '接口设计|design|browse|prod
$lang->design->menu->bysearch = array('link' => ' ' . $lang->searchAB . '');
$lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
+$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index 0ffb647a14..e6ed9f8320 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -918,9 +918,10 @@ $lang->menu->waterfall->programplan = array('link' => '計劃|programplan|bro
$lang->menu->waterfall->project = array('link' => $lang->executionCommon . '|project|task|executionID={EXECUTION}', 'subModule' => ',project,task,');
$lang->menu->waterfall->doc = array('link' => '文檔|doc|index|project={PROJECT}');
$lang->menu->waterfall->weekly = array('link' => '報告|weekly|index|project={PROJECT}', 'subModule' => ',milestone,');
-$lang->menu->waterfall->projectstory = array('link' => '需求|projectstory|story', 'alias' => 'story,track');
+$lang->menu->waterfall->projectstory = array('link' => '需求|projectstory|story', 'alias' => 'story');
$lang->menu->waterfall->design = '設計|design|browse|product={PRODUCT}';
$lang->menu->waterfall->ci = '代碼|repo|browse|';
+$lang->menu->waterfall->track = '矩陣|projectstory|track';
$lang->menu->waterfall->qa = '測試|qa|index';
$lang->menu->waterfall->projectrelease = array('link' => '發佈|projectrelease|browse');
$lang->menu->waterfall->projectbuild = array('link' => '版本|projectbuild|browse|project={PROJECT}');
@@ -986,10 +987,7 @@ $lang->budget->menu = $lang->workestimation->menu;
$lang->programplan->menu->gantt = array('link' => '甘特圖|programplan|browse|programID={PROJECT}&productID={PRODUCT}&type=gantt');
$lang->programplan->menu->lists = array('link' => '階段列表|programplan|browse|programID={PROJECT}&productID={PRODUCT}&type=lists', 'alias' => 'create');
-$lang->projectstory->menu->story = array('link' => "{$lang->SRCommon}|projectstory|story", 'subModule' => 'story,project', 'alias' => 'linkstory');
-$lang->projectstory->menu->track = array('link' => '跟蹤矩陣|projectstory|track', 'subModule' => '');
-
$lang->nc->menu = $lang->auditplan->menu;
-$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search', 'stage');
+$lang->noMenuModule = array('my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search', 'stage');
include (dirname(__FILE__) . '/menuOrder.php');
diff --git a/module/product/control.php b/module/product/control.php
index 07b464c2d5..84f5ba561a 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -196,8 +196,8 @@ class product extends control
$stories = $this->product->getStories($productID, $branch, $browseType, $queryID, $moduleID, $storyType, $sort, $pager);
if($this->app->rawModule == 'projectstory')
{
- $products = $this->product->getProductsByProject($this->session->PRJ);
- $productPlans = $this->loadModel('project')->getPlans($products);
+ $projectProducts = $this->product->getProductsByProject($this->session->PRJ);
+ $productPlans = $this->loadModel('project')->getPlans($projectProducts);
if($browseType == 'bybranch') $param = $branch;
$stories = $this->story->getProjectStories($this->session->PRJ, $sort, $browseType, $param, 'story', '', $pager, $productID, $branch);
@@ -239,36 +239,37 @@ class product extends control
$this->view->modulePairs = $showModule ? $this->tree->getModulePairs($productID, 'story', $showModule) : array();
/* Assign. */
- $this->view->title = $this->products[$productID]. $this->lang->colon . $this->lang->product->browse;
- $this->view->position[] = $this->products[$productID];
- $this->view->position[] = $this->lang->product->browse;
- $this->view->productID = $productID;
- $this->view->product = $this->product->getById($productID);
- $this->view->productName = $this->products[$productID];
- $this->view->moduleID = $moduleID;
- $this->view->stories = $stories;
- $this->view->plans = $this->loadModel('productplan')->getPairs($productID, $branch, '', true);
- $this->view->productPlans = isset($productPlans) ? $productPlans : array();
- $this->view->summary = $this->product->summary($stories, $storyType);
- $this->view->moduleTree = $moduleTree;
- $this->view->parentModules = $this->tree->getParents($moduleID);
- $this->view->pager = $pager;
- $this->view->users = $this->user->getPairs('noletter|pofirst|nodeleted');
- $this->view->orderBy = $orderBy;
- $this->view->browseType = $browseType;
- $this->view->modules = $this->tree->getOptionMenu($productID, 'story', 0, $branch);
- $this->view->moduleID = $moduleID;
- $this->view->moduleName = $moduleID ? $this->tree->getById($moduleID)->name : $this->lang->tree->all;
- $this->view->branch = $branch;
- $this->view->branches = $this->loadModel('branch')->getPairs($productID);
- $this->view->storyStages = $this->product->batchGetStoryStage($stories);
- $this->view->setModule = true;
- $this->view->storyTasks = $storyTasks;
- $this->view->storyBugs = $storyBugs;
- $this->view->storyCases = $storyCases;
- $this->view->param = $param;
- $this->view->products = $this->products;
- $this->view->storyType = $storyType;
+ $this->view->title = $this->products[$productID]. $this->lang->colon . $this->lang->product->browse;
+ $this->view->position[] = $this->products[$productID];
+ $this->view->position[] = $this->lang->product->browse;
+ $this->view->productID = $productID;
+ $this->view->product = $this->product->getById($productID);
+ $this->view->productName = $this->products[$productID];
+ $this->view->moduleID = $moduleID;
+ $this->view->stories = $stories;
+ $this->view->plans = $this->loadModel('productplan')->getPairs($productID, $branch, '', true);
+ $this->view->productPlans = isset($productPlans) ? $productPlans : array();
+ $this->view->summary = $this->product->summary($stories, $storyType);
+ $this->view->moduleTree = $moduleTree;
+ $this->view->parentModules = $this->tree->getParents($moduleID);
+ $this->view->pager = $pager;
+ $this->view->users = $this->user->getPairs('noletter|pofirst|nodeleted');
+ $this->view->orderBy = $orderBy;
+ $this->view->browseType = $browseType;
+ $this->view->modules = $this->tree->getOptionMenu($productID, 'story', 0, $branch);
+ $this->view->moduleID = $moduleID;
+ $this->view->moduleName = $moduleID ? $this->tree->getById($moduleID)->name : $this->lang->tree->all;
+ $this->view->branch = $branch;
+ $this->view->branches = $this->loadModel('branch')->getPairs($productID);
+ $this->view->storyStages = $this->product->batchGetStoryStage($stories);
+ $this->view->setModule = true;
+ $this->view->storyTasks = $storyTasks;
+ $this->view->storyBugs = $storyBugs;
+ $this->view->storyCases = $storyCases;
+ $this->view->param = $param;
+ $this->view->products = $this->products;
+ $this->view->projectProducts = isset($projectProducts) ? $projectProducts : array();
+ $this->view->storyType = $storyType;
$this->display();
}
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index f637a11947..98eac1ef05 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -40,6 +40,19 @@ $lang->story->createCommon = $storyType == 'story' ? $lang->story->createStory :