diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php index 144ea0b602..f362b8ccd9 100644 --- a/module/productplan/view/browse.html.php +++ b/module/productplan/view/browse.html.php @@ -13,7 +13,11 @@ productplan->confirmDelete)?>
-
productplan->browse;?>
+
+ + type !== 'normal') echo '' . $branches[$branch] . '';?> + productplan->browse;?> +
id&branch=$branch", '', 'button', 'plus');?>
diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php index e7625774c0..6063877f6c 100644 --- a/module/release/view/browse.html.php +++ b/module/release/view/browse.html.php @@ -15,7 +15,11 @@ release->confirmDelete)?>
-
release->browse;?>
+
+ + type !== 'normal') echo '' . $branches[$branch] . '';?> + release->browse;?> +
id&branch=$branch");?>
diff --git a/module/story/control.php b/module/story/control.php index e2ac4458ee..870daa1022 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -265,7 +265,7 @@ class story extends control $this->view->storyTitle = $title; $this->view->spec = $spec; $this->view->branch = $branch; - $this->view->branchGroups = $this->loadModel('branch')->getByProducts($productID); + $this->view->branches = $this->loadModel('branch')->getPairs($productID); $this->display(); } diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index abec4b409e..3b71a88b52 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -40,7 +40,7 @@ $lang->story->common = '需求'; $lang->story->id = '编号'; $lang->story->product = "所属{$lang->productCommon}"; $lang->story->module = '所属模块'; -$lang->story->source = '来源'; +$lang->story->source = '需求来源'; $lang->story->fromBug = '来源Bug'; $lang->story->release = '发布计划'; $lang->story->bug = '相关bug'; diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php index 3838ef70b0..fddc5506e6 100644 --- a/module/story/lang/zh-tw.php +++ b/module/story/lang/zh-tw.php @@ -40,7 +40,7 @@ $lang->story->common = '需求'; $lang->story->id = '編號'; $lang->story->product = "所屬{$lang->productCommon}"; $lang->story->module = '所屬模組'; -$lang->story->source = '來源'; +$lang->story->source = '需求來源'; $lang->story->fromBug = '來源Bug'; $lang->story->release = '發佈計劃'; $lang->story->bug = '相關bug'; diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php index 450779ef0c..a5258339ca 100644 --- a/module/story/view/batchcreate.html.php +++ b/module/story/view/batchcreate.html.php @@ -16,8 +16,8 @@ icons['story']);?> icons['batchCreate']);?> + type !== 'normal') echo '' . $branches[$branch] . '';?> story->batchCreate;?> - type !== 'normal') echo '' . $branchGroups[$productID][$branch] . '';?>
createLink('file', 'uploadImages', 'module=story¶ms=' . helper::safe64Encode("productID=$productID&moduleID=$moduleID")), $lang->uploadImages, '', "data-toggle='modal' data-type='iframe' class='btn' data-width='600px'")?>