diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index 517783d7e8..63ac3630a4 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -80,6 +80,9 @@ if($config->global->flow != 'onlyTest') common::printIcon('bug', 'toStory', "product=$bug->product&branch=$bug->branch&module=0&story=0&project=0&bugID=$bug->id", $bug, 'button', $lang->icons['story']); common::printIcon('bug', 'createCase', $convertParams, $bug, 'button', 'sitemap'); + $flow = $this->loadModel('workflow')->getByModule('bug'); + echo $this->loadModel('flow')->buildOperateMenu($flow, $bug, 'view'); + echo "
"; common::printIcon('bug', 'edit', $params, $bug); common::printIcon('bug', 'create', $copyParams, $bug, 'button', 'copy'); diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php index 57b04b23ca..462cda779c 100644 --- a/module/build/view/view.html.php +++ b/module/build/view/view.html.php @@ -50,6 +50,9 @@ tbody tr td:first-child input{display:none;} deleted) { + $flow = $this->loadModel('workflow')->getByModule('build'); + echo $this->loadModel('flow')->buildOperateMenu($flow, $build, 'view'); + if(common::hasPriv('build', 'edit')) echo html::a($this->createLink('build', 'edit', "buildID=$build->id"), " " . $this->lang->edit, '', "class='btn btn-link' title='{$this->lang->edit}'"); if(common::hasPriv('build', 'delete')) echo html::a($this->createLink('build', 'delete', "buildID=$build->id"), " " . $this->lang->delete, '', "class='btn btn-link' title='{$this->lang->delete}' target='hiddenwin'"); } diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php index bdab189f52..2451f5b9d2 100644 --- a/module/product/view/view.html.php +++ b/module/product/view/view.html.php @@ -90,7 +90,11 @@ common::printBack($browseLink); if(!$product->deleted) { + $flow = $this->loadModel('workflow')->getByModule('product'); + echo $this->loadModel('flow')->buildOperateMenu($flow, $product, 'view'); + echo "
"; + if($product->status != 'closed') { common::printIcon('product', 'close', $params, $product, 'button', '', '', 'iframe', true); diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php index 6869d58783..7f48d53a06 100644 --- a/module/productplan/view/view.html.php +++ b/module/productplan/view/view.html.php @@ -37,6 +37,9 @@ deleted) { + $flow = $this->loadModel('workflow')->getByModule('productplan'); + echo $this->loadModel('flow')->buildOperateMenu($flow, $productplan, 'view'); + if(common::hasPriv('productplan', 'create') and $plan->parent <= '0') echo html::a($this->createLink('productplan', 'create', "product={$plan->product}&branch={$plan->branch}&parent={$plan->id}"), " " . $this->lang->productplan->children , '', "class='btn btn-link' title='{$this->lang->productplan->children}'"); if(common::hasPriv('productplan', 'edit')) echo html::a($this->createLink('productplan', 'edit', "planID=$plan->id"), " " . $this->lang->edit, '', "class='btn btn-link' title='{$this->lang->edit}'"); if(common::hasPriv('productplan', 'delete')) echo html::a($this->createLink('productplan', 'delete', "planID=$plan->id"), " " . $this->lang->delete, '', "class='btn btn-link' title='{$this->lang->delete}' target='hiddenwin'"); diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php index ca624de568..a55dc84af8 100644 --- a/module/project/view/view.html.php +++ b/module/project/view/view.html.php @@ -162,6 +162,9 @@ common::printIcon('project', 'suspend', "projectID=$project->id", $project, 'button', '', '', 'iframe', true); common::printIcon('project', 'close', "projectID=$project->id", $project, 'button', '', '', 'iframe', true); + $flow = $this->loadModel('workflow')->getByModule('project'); + echo $this->loadModel('flow')->buildOperateMenu($flow, $project, 'view'); + echo "
"; common::printIcon('project', 'edit', $params, $project); common::printIcon('project', 'delete', $params, $project, 'button', 'trash', 'hiddenwin'); diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php index 8a406a4490..5ab9351fcd 100644 --- a/module/release/view/view.html.php +++ b/module/release/view/view.html.php @@ -33,6 +33,9 @@ deleted) { + $flow = $this->loadModel('workflow')->getByModule('release'); + echo $this->loadModel('flow')->buildOperateMenu($flow, $release, 'view'); + if(common::hasPriv('release', 'changeStatus', $release)) { $changedStatus = $release->status == 'normal' ? 'terminate' : 'normal'; diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index 00eabf0bb8..139cd0bf2c 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -104,6 +104,9 @@ if($from == 'project') common::printIcon('task', 'create', "project=$param&storyID=$story->id&moduleID=$story->module", $story, 'button', 'plus', '', 'showinonlybody'); + $flow = $this->loadModel('workflow')->getByModule('story'); + echo $this->loadModel('flow')->buildOperateMenu($flow, $story, 'view'); + echo "
"; common::printIcon('story', 'edit', "storyID=$story->id", $story); common::printIcon('story', 'create', "productID=$story->product&branch=$story->branch&moduleID=$story->module&storyID=$story->id", $story, 'button', 'copy', '', '', true, "data-width='1050'"); diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index 020453e9f3..432fef1eae 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -164,6 +164,9 @@ common::printIcon('task', 'close', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true); common::printIcon('task', 'cancel', "taskID=$task->id", $task, 'button', '', '', 'iframe showinonlybody', true); + $flow = $this->loadModel('workflow')->getByModule('task'); + echo $this->loadModel('flow')->buildOperateMenu($flow, $task, 'view'); + if(!isonlybody()) echo "
"; common::printIcon('task', 'edit', "taskID=$task->id", $task, 'button', '', '', 'showinonlybody'); common::printIcon('task', 'create', "projctID={$task->project}&storyID=0&moduleID=0&taskID=$task->id", $task, 'button', 'copy'); diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index 6c1b39ec74..975addc7d4 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -114,6 +114,12 @@ } if($config->testcase->needReview or !empty($config->testcase->forceReview)) common::printIcon('testcase', 'review', "caseID=$case->id", $case, 'button', '', '', 'iframe', '', '', $lang->testcase->reviewAB); ?> + + loadModel('workflow')->getByModule('testcase'); + echo $this->loadModel('flow')->buildOperateMenu($flow, $case, 'view'); + ?> + id", $case); if(!$isLibCase) common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase¶m=$case->id", $case, 'button', 'copy'); diff --git a/module/testsuite/view/view.html.php b/module/testsuite/view/view.html.php index 474c752ec6..57f63d8875 100644 --- a/module/testsuite/view/view.html.php +++ b/module/testsuite/view/view.html.php @@ -31,6 +31,9 @@ deleted) { + $flow = $this->loadModel('workflow')->getByModule('testsuite'); + echo $this->loadModel('flow')->buildOperateMenu($flow, $suite, 'view'); + common::printIcon('testsuite', 'linkCase', "suiteID=$suite->id", $suite, 'button', 'link'); common::printIcon('testsuite', 'edit', "suiteID=$suite->id"); common::printIcon('testsuite', 'delete', "suiteID=$suite->id", '', 'button', 'trash', 'hiddenwin'); diff --git a/module/testtask/view/view.html.php b/module/testtask/view/view.html.php index dea3cddf45..d976e32be2 100644 --- a/module/testtask/view/view.html.php +++ b/module/testtask/view/view.html.php @@ -56,6 +56,12 @@ common::printIcon('testtask', 'cases', "taskID=$task->id", $task, 'button', 'sitemap'); common::printIcon('testtask', 'linkCase', "taskID=$task->id", $task, 'button', 'link'); ?> + + loadModel('workflow')->getByModule('testtask'); + echo $this->loadModel('flow')->buildOperateMenu($flow, $task, 'view'); + ?> +
id", $task);