-
+
index->upgradeVersion;?>
diff --git a/module/my/lang/de.php b/module/my/lang/de.php
index 4c91fcb7fd..7c946d94c5 100644
--- a/module/my/lang/de.php
+++ b/module/my/lang/de.php
@@ -45,7 +45,7 @@ $lang->my->myExecutions = "My Stage/Sprint/Iteration";
$lang->my->name = 'Name';
$lang->my->code = 'Code';
$lang->my->projects = 'Project';
-$lang->my->executions = $lang->executionCommon;
+$lang->my->executions = 'Executions';
$lang->my->executionMenu = new stdclass();
$lang->my->executionMenu->undone = 'Undone';
diff --git a/module/my/lang/en.php b/module/my/lang/en.php
index 4c91fcb7fd..7c946d94c5 100644
--- a/module/my/lang/en.php
+++ b/module/my/lang/en.php
@@ -45,7 +45,7 @@ $lang->my->myExecutions = "My Stage/Sprint/Iteration";
$lang->my->name = 'Name';
$lang->my->code = 'Code';
$lang->my->projects = 'Project';
-$lang->my->executions = $lang->executionCommon;
+$lang->my->executions = 'Executions';
$lang->my->executionMenu = new stdclass();
$lang->my->executionMenu->undone = 'Undone';
diff --git a/module/my/lang/fr.php b/module/my/lang/fr.php
index 4c91fcb7fd..7c946d94c5 100644
--- a/module/my/lang/fr.php
+++ b/module/my/lang/fr.php
@@ -45,7 +45,7 @@ $lang->my->myExecutions = "My Stage/Sprint/Iteration";
$lang->my->name = 'Name';
$lang->my->code = 'Code';
$lang->my->projects = 'Project';
-$lang->my->executions = $lang->executionCommon;
+$lang->my->executions = 'Executions';
$lang->my->executionMenu = new stdclass();
$lang->my->executionMenu->undone = 'Undone';
diff --git a/module/my/lang/vi.php b/module/my/lang/vi.php
index 4c91fcb7fd..7c946d94c5 100644
--- a/module/my/lang/vi.php
+++ b/module/my/lang/vi.php
@@ -45,7 +45,7 @@ $lang->my->myExecutions = "My Stage/Sprint/Iteration";
$lang->my->name = 'Name';
$lang->my->code = 'Code';
$lang->my->projects = 'Project';
-$lang->my->executions = $lang->executionCommon;
+$lang->my->executions = 'Executions';
$lang->my->executionMenu = new stdclass();
$lang->my->executionMenu->undone = 'Undone';
diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php
index 5bbc6cf9a7..84ed89ed58 100644
--- a/module/my/lang/zh-cn.php
+++ b/module/my/lang/zh-cn.php
@@ -45,7 +45,7 @@ $lang->my->myExecutions = "我参与的阶段/冲刺/迭代";
$lang->my->name = '名称';
$lang->my->code = '代号';
$lang->my->projects = '所属项目';
-$lang->my->executions = '所属' . $lang->executionCommon;
+$lang->my->executions = '所属执行';
$lang->my->executionMenu = new stdclass();
$lang->my->executionMenu->undone = '未结束';
diff --git a/module/my/lang/zh-tw.php b/module/my/lang/zh-tw.php
index 86b24ac7ac..ac312d6131 100644
--- a/module/my/lang/zh-tw.php
+++ b/module/my/lang/zh-tw.php
@@ -46,7 +46,7 @@ $lang->my->myExecutions = "我參與的階段/衝刺/迭代";
$lang->my->name = '名稱';
$lang->my->code = '代號';
$lang->my->projects = '所屬項目';
-$lang->my->executions = '所屬' . $lang->executionCommon;
+$lang->my->executions = '所屬執行';
$lang->my->executionMenu = new stdclass();
$lang->my->executionMenu->undone = '未結束';
diff --git a/module/product/control.php b/module/product/control.php
index a5b85ba588..9be40fb686 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -122,7 +122,11 @@ class product extends control
$productID = $this->app->openApp != 'project' ? $this->product->saveState($productID, $this->products) : $productID;
if($this->app->openApp == 'product') $this->product->setMenu($productID, $branch);
- if($this->app->openApp == 'project') $this->loadModel('project')->setMenu($projectID);
+ if($this->app->openApp == 'project')
+ {
+ $this->session->set('storyList', $this->app->getURI(true), 'project');
+ $this->loadModel('project')->setMenu($projectID);
+ }
/* Lower browse type. */
$browseType = strtolower($browseType);
@@ -170,25 +174,20 @@ class product extends control
{
setcookie('treeBranch', (int)$branch, 0, $this->config->webRoot, '', false, false);
$browseType = 'unclosed';
- if($this->app->rawModule == 'projectstory' and empty($productID))
- {
- $moduleTree = $this->tree->getExecutionStoryTreeMenu($this->session->project, 0, array('treeModel', 'createProjectStoryLink'));
- }
- else
- {
- $moduleTree = $this->tree->getTreeMenu($productID, 'story', $startModuleID = 0, array('treeModel', $createModuleLink), '', $branch, "¶m=$param&storyType=$storyType");
- }
}
else
{
- if($this->app->rawModule == 'projectstory' and empty($productID))
- {
- $moduleTree = $this->tree->getExecutionStoryTreeMenu($this->session->project, 0, array('treeModel', 'createProjectStoryLink'));
- }
- else
- {
- $moduleTree = $this->tree->getTreeMenu($productID, 'story', $startModuleID = 0, array('treeModel', $createModuleLink), '', (int)$this->cookie->treeBranch, "¶m=$param&storyType=$storyType");
- }
+ $branch = (int)$this->cookie->treeBranch;
+ }
+
+ /* If in project story and not chose product, get project story mdoules. */
+ if($this->app->rawModule == 'projectstory' and empty($productID))
+ {
+ $moduleTree = $this->tree->getProjectStoryTreeMenu($projectID, 0, array('treeModel', $createModuleLink));
+ }
+ else
+ {
+ $moduleTree = $this->tree->getTreeMenu($productID, 'story', $startModuleID = 0, array('treeModel', $createModuleLink), array('projectID' => $projectID, 'productID' => $productID), $branch, "¶m=$param&storyType=$storyType");
}
if($browseType != 'bymodule' and $browseType != 'bybranch') $this->session->set('storyBrowseType', $browseType);
@@ -211,12 +210,12 @@ class product extends control
if($this->app->rawModule == 'projectstory')
{
if(!empty($product)) $this->session->set('currentProductType', $product->type);
- $this->products = $this->loadModel('project')->getProducts($this->session->project, false);
- $projectProducts = $this->product->getProducts($this->session->project);
+ $this->products = $this->loadModel('project')->getProducts($projectID, false);
+ $projectProducts = $this->product->getProducts($projectID);
$productPlans = $this->execution->getPlans($projectProducts);
if($browseType == 'bybranch') $param = $branch;
- $stories = $this->story->getExecutionStories($this->session->project, $productID, $branch, $sort, $browseType, $param, 'story', '', $pager);
+ $stories = $this->story->getExecutionStories($projectID, $productID, $branch, $sort, $browseType, $param, 'story', '', $pager);
}
else
{
@@ -1172,18 +1171,6 @@ class product extends control
$this->display();
}
- /**
- * Doc for compatible.
- *
- * @param int $productID
- * @access public
- * @return void
- */
- public function doc($productID)
- {
- $this->locate($this->createLink('doc', 'objectLibs', "type=product&objectID=$productID&from=product"));
- }
-
/**
* Build of product.
*
diff --git a/module/product/model.php b/module/product/model.php
index eda1a50f8a..7662eb4efd 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -448,6 +448,7 @@ class productModel extends model
if(isset($currentProduct->type) && $currentProduct->type != 'normal')
{
+ $this->lang->product->branch = sprintf($this->lang->product->branch, $this->lang->product->branchName[$currentProduct->type]);
$branches = $this->loadModel('branch')->getPairs($productID);
$branch = empty($branch) ? (int)$this->cookie->preBranch : $branch;
$branchName = isset($branches[$branch]) ? $branches[$branch] : $branches[0];
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 901ed294f4..01a86832db 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -142,7 +142,8 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
- createLink('story', 'create', "product=$productID&branch=$branch&moduleID=$moduleID&storyID=0&projectID=$projectID"), " {$lang->story->create}", '', "class='btn $buttonType' data-app='$openApp'");?>
+
+ createLink('story', 'create', "product=$productID&branch=$branch&moduleID=$moduleID&storyID=0&projectID=0$extraParam"), " {$lang->story->create}", '', "class='btn $buttonType' data-app='$openApp'");?>