diff --git a/module/program/control.php b/module/program/control.php index d6f16f8ff6..60ade68fa4 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -9,41 +9,6 @@ class program extends control $this->programs = $this->program->getPairs(); } - public function transfer($programID = 0) - { - $this->session->set('program', $programID); - $program = $this->project->getByID($programID); - $programProjects = $this->project->getPairs(); - $programProject = key($programProjects); - - if($program->template == 'cmmi') - { - $link = $this->createLink('programplan', 'browse', 'programID=' . $programID); - } - if($program->template == 'scrum') - { - $link = $programProject ? $this->createLink('project', 'task', 'projectID=' . $programProject) : $this->createLink('project', 'create', '', '', '', $programID); - } - - die(js::locate($link, 'parent')); - } - - /** - * Common actions. - * - * @param int $projectID - * @access public - * @return object current object - */ - public function commonAction($projectID = 0, $extra = '') - { - /* Set menu. */ - //$this->projects = $this->project->getPairs('nocode'); - //$projectID = $this->project->saveState($projectID, $this->projects); - //$selectHtml = $this->project->select('', $projectID, 0, 'project', 'task', $extra); - //$this->lang->programSwapper = $selectHtml; - } - public function index($status = 'doing', $orderBy = 'order_desc', $recTotal = 0, $recPerPage = 10, $pageID = 1) { $this->commonAction(); @@ -661,4 +626,30 @@ class program extends control $this->view->programs = $programs; $this->display(); } + + /** + * Ajax get program enter link. + * + * @param int $programID + * @access public + * @return void + */ + public function ajaxGetEnterLink($programID = 0) + { + $this->session->set('program', $programID); + $program = $this->project->getByID($programID); + $programProjects = $this->project->getPairs(); + $programProject = key($programProjects); + + if($program->template == 'cmmi') + { + $link = $this->createLink('programplan', 'browse', 'programID=' . $programID); + } + if($program->template == 'scrum') + { + $link = $programProject ? $this->createLink('project', 'task', 'projectID=' . $programProject) : $this->createLink('project', 'create', '', '', '', $programID); + } + + die($link); + } } diff --git a/module/program/js/index.js b/module/program/js/index.js index fa840f3578..c9b74f4201 100644 --- a/module/program/js/index.js +++ b/module/program/js/index.js @@ -38,4 +38,14 @@ $(function() for(i = 0; i < data.list.length; i++) list += $(data.list[i].item).attr('data-id') + ','; $.post(createLink('project', 'updateOrder'), {'projects' : list, 'orderBy' : orderBy}); }); + + $('.pgm-title .transfer').click(function() + { + var programID = $(this).attr('data-id'); + var link = createLink('program', 'ajaxGetEnterLink', "programID=" + programID); + $.post(link, function(pgmLink) + { + location.href = pgmLink; + }) + }) }) diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php index b32416bf5c..4efcb7f82c 100644 --- a/module/program/view/browsebylist.html.php +++ b/module/program/view/browsebylist.html.php @@ -27,8 +27,8 @@ id);?> code;?> - - createLink('program', 'transfer', 'projectID=' . $project->id), $project->name);?> + + name, '', "data-id=$project->id class=transfer");?> project->statusList, $project->status, '');?> begin;?>