diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index 2bea092315..65d7ba31ea 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -242,7 +242,7 @@ $lang->scrum->menu->settings['subMenu']->group = array('link' => "{$lang-> /* Waterfall menu. */ $lang->waterfall->menu = new stdclass(); $lang->waterfall->menu->index = array('link' => "$lang->dashboard|project|index|project=%s"); -$lang->waterfall->menu->execution = array('link' => "{$lang->stage->common}|project|execution|status=all&projectID=%s", 'alias' => 'batchcreate'); +$lang->waterfall->menu->execution = array('link' => "{$lang->stage->common}|project|execution|status=all&projectID=%s", 'subModule' => 'programplan'); $lang->waterfall->menu->story = array('link' => "$lang->SRCommon|projectstory|story|project=%s", 'subModule' => 'projectstory,tree', 'exclude' => 'projectstory-track'); $lang->waterfall->menu->design = array('link' => "{$lang->design->common}|design|browse|project=%s"); $lang->waterfall->menu->qa = array('link' => "{$lang->qa->common}|project|bug|projectID=%s", 'subModule' => 'testcase,testtask,bug', 'alias' => 'bug,testtask,testcase'); diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php index 6adef7c96c..c7b1314809 100644 --- a/module/execution/view/all.html.php +++ b/module/execution/view/all.html.php @@ -40,7 +40,7 @@
" . $lang->export, '', "class='btn btn-link export'")?> model == 'waterfall'):?> - createLink('project', 'batchcreate', "projectID=$projectID&productID=$productID"), " " . $lang->programplan->create, '', "class='btn btn-primary'");?> + createLink('programplan', 'create', "projectID=$projectID&productID=$productID"), " " . $lang->programplan->create, '', "class='btn btn-primary'");?> createLink('execution', 'create', "projectID=$projectID"), " " . ((($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->createExec : $lang->execution->create), '', "class='btn btn-primary create-execution-btn' data-app='$from'");?>
diff --git a/module/project/control.php b/module/project/control.php index 7a240b4ed2..022f155e7d 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -856,11 +856,6 @@ class project extends control echo $this->fetch('execution', 'all', "status=$status&projectID=$projectID&orderBy=$orderBy&productID=$productID&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"); } - public function batchCreate($projectID = 0, $productID = 0, $planID = 0) - { - echo $this->fetch('programplan', 'create', "projectID=$projectID&productID=$productID&planID=$planID"); - } - /** * Project qa dashboard. *