diff --git a/module/bug/control.php b/module/bug/control.php index 98e23c63b7..056e4bc4ac 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -441,6 +441,7 @@ class bug extends control $this->view->moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'bug', $startModuleID = 0, $branch); $this->view->moduleID = $moduleID; $this->view->branch = $branch; + $this->view->branches = $this->loadModel('branch')->getPairs($productID); $this->display(); } diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php index a675ed4dfd..0be8fd8f1a 100644 --- a/module/bug/view/batchcreate.html.php +++ b/module/bug/view/batchcreate.html.php @@ -14,7 +14,11 @@
icons['bug']);?> - icons['batchCreate']);?> bug->common . $lang->colon . $lang->bug->batchCreate;?> + + icons['batchCreate']);?> + session->currentProductType !== 'normal') echo '' . $branches[$branch] . '';?> + bug->common . $lang->colon . $lang->bug->batchCreate;?> +
createLink('file', 'uploadImages', 'module=bug¶ms=' . helper::safe64Encode("productID=$productID&projectID=$projectID&moduleID=$moduleID")), $lang->uploadImages, '', "data-toggle='modal' data-type='iframe' class='btn' data-width='600px'")?> pasteText, "data-toggle='myModal'")?> diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php index f362b8ccd9..65b954caaf 100644 --- a/module/productplan/view/browse.html.php +++ b/module/productplan/view/browse.html.php @@ -15,7 +15,7 @@
- type !== 'normal') echo '' . $branches[$branch] . '';?> + type !== 'normal') echo '' . $branches[$branch] . '';?> productplan->browse;?>
diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php index 3e76dc19b6..265c9940f9 100644 --- a/module/release/view/browse.html.php +++ b/module/release/view/browse.html.php @@ -17,7 +17,7 @@
- type !== 'normal') echo '' . $branches[$branch] . '';?> + type !== 'normal') echo '' . $branches[$branch] . '';?> release->browse;?>
diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php index a5258339ca..6ead44074f 100644 --- a/module/story/view/batchcreate.html.php +++ b/module/story/view/batchcreate.html.php @@ -16,7 +16,7 @@ icons['story']);?> icons['batchCreate']);?> - type !== 'normal') echo '' . $branches[$branch] . '';?> + type !== 'normal') echo '' . $branches[$branch] . '';?> story->batchCreate;?>
diff --git a/module/testcase/control.php b/module/testcase/control.php index 02773242f8..b1dc848156 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -417,6 +417,7 @@ class testcase extends control $this->view->type = $type; $this->view->title = $title; $this->view->branch = $branch; + $this->view->branches = $this->loadModel('branch')->getPairs($productID); $this->display(); } diff --git a/module/testcase/view/batchcreate.html.php b/module/testcase/view/batchcreate.html.php index 32607ee50e..40cae6bdb7 100644 --- a/module/testcase/view/batchcreate.html.php +++ b/module/testcase/view/batchcreate.html.php @@ -17,7 +17,11 @@
icons['testcase']);?> - icons['batchCreate']);?> testcase->batchCreate;?> + + icons['batchCreate']);?> + session->currentProductType !== 'normal') echo '' . $branches[$branch] . '';?> + testcase->batchCreate;?> + icons['story']) . ' ' . $story->title ?>