Merge branch '15.5' into 165

This commit is contained in:
王怡栋
2021-10-09 10:06:05 +08:00
63 changed files with 711 additions and 531 deletions
+7 -2
View File
@@ -141,11 +141,12 @@ class program extends control
/**
* Create a program.
*
* @param int $parentProgramID
* @param int $parentProgramID
* @param string $extra
* @access public
* @return void
*/
public function create($parentProgramID = 0)
public function create($parentProgramID = 0, $extra = '')
{
$parentProgram = $this->program->getByID($parentProgramID);
@@ -159,9 +160,13 @@ class program extends control
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse')));
}
$extra = str_replace(array(',', ' '), array('&', ''), $extra);
parse_str($extra, $output);
$this->view->title = $this->lang->program->create;
$this->view->position[] = $this->lang->program->create;
$this->view->gobackLink = (isset($output['from']) and $output['from'] == 'global') ? $this->createLink('program', 'browse') : '';
$this->view->pmUsers = $this->loadModel('user')->getPairs('noclosed|nodeleted|pmfirst');
$this->view->poUsers = $this->user->getPairs('noclosed|nodeleted|pofirst');
$this->view->users = $this->user->getPairs('noclosed|nodeleted');