diff --git a/module/upgrade/control.php b/module/upgrade/control.php index b5e41345e8..a2fe040467 100644 --- a/module/upgrade/control.php +++ b/module/upgrade/control.php @@ -272,6 +272,7 @@ class upgrade extends control $this->upgrade->processMergedData(0, $projectID, array(), array($sprintID)); } } + die(js::locate($this->createLink('upgrade', 'mergeProgram', "type=$type"), 'parent')); } diff --git a/module/upgrade/model.php b/module/upgrade/model.php index d7ccd5e3f2..ee021e215b 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -4198,6 +4198,8 @@ class upgradeModel extends model /* If is project admin, have all project priv. */ $PRJAdminGroupID = $this->dao->select('id')->from(TABLE_GROUP)->where('role')->eq('PRJAdmin')->fetch('id'); + + $this->app->loadLang('group'); foreach($this->lang->resource->program as $method => $methodLang) { $data = new stdclass();