diff --git a/module/program/control.php b/module/program/control.php index 0e10f25e4f..14f64d573f 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -1056,6 +1056,8 @@ class program extends control $moduleIndex = array_search('program', $this->lang->noMenuModule); if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]); + $this->app->session->set('PRJEdit', $this->app->getURI(true)); + $products = $this->loadModel('product')->getProductsByProject($projectID);; $linkedBranches = array(); foreach($products as $product) diff --git a/module/program/js/prjedit.js b/module/program/js/prjedit.js index 06e4ae225a..45d24a5cc3 100644 --- a/module/program/js/prjedit.js +++ b/module/program/js/prjedit.js @@ -9,6 +9,13 @@ $(function() adjustPlanBoxMargin(); }); +/** + * Set aclList. + * + * @param int $programID + * @access public + * @return void + */ function setAclList(programID) { if(programID != 0) @@ -21,6 +28,12 @@ function setAclList(programID) } } +/** + * Set parent program. + * + * @access public + * @return void + */ function setParentProgram() { var parentProgram = $("#parent").val(); diff --git a/module/program/view/prjview.html.php b/module/program/view/prjview.html.php index ea66aa06ff..8cabe1f3bf 100644 --- a/module/program/view/prjview.html.php +++ b/module/program/view/prjview.html.php @@ -103,7 +103,7 @@ echo $this->buildOperateMenu($project, 'view'); echo "
"; - common::printIcon('program', 'PRJEdit', "projectID=$project->id&parent=$project->parent", $project, 'button', 'edit', '', '', '', '', $lang->edit); + common::printIcon('program', 'PRJEdit', $params . "programID=$project->parent", $project, 'button', 'edit', '', '', '', '', $lang->edit); common::printIcon('program', 'PRJDelete', $params, $project, 'button', 'trash', 'hiddenwin', '', '', '', $lang->delete); } ?>