* Modify upgrade model.php logic.

This commit is contained in:
leiyong
2020-11-20 15:29:11 +08:00
parent 4f4f6cbf9d
commit ea0cff9182
2 changed files with 3 additions and 0 deletions

View File

@@ -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'));
}

View File

@@ -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();