diff --git a/module/program/control.php b/module/program/control.php index 4442cc403f..33b2304a40 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -627,7 +627,7 @@ class program extends control } $this->view->programTree = $this->programZen->buildTree($programs); - $this->view->link = $this->program->getLink($module, $method, '{id}', '', 'program'); + $this->view->link = $this->programZen->getLink($module, $method, '{id}', '', 'program'); $this->display(); } diff --git a/module/program/model.php b/module/program/model.php index de61c835df..15fc5ca890 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -986,7 +986,7 @@ class programModel extends model * @access public * @return array|bool */ - public function close(object $program, object $oldProgram) :array|bool + public function close(object $program, object $oldProgram): array|bool { $program = $this->loadModel('file')->processImgURL($program, $this->config->program->editor->close['id'], $this->post->uid); $this->dao->update(TABLE_PROJECT)->data($program) @@ -1010,7 +1010,7 @@ class programModel extends model * @access public * @return array|false */ - public function activate(object $program, $oldProgram) :array|false + public function activate(object $program, $oldProgram): array|false { if($program->begin > $program->end) { @@ -1066,35 +1066,6 @@ class programModel extends model return true; } - /** - * Get link for drop tree menu. - * - * @param string $moduleName - * @param string $methodName - * @param int $programID - * @param string $vars - * @param string $from - * @access public - * @return string - */ - public function getLink($moduleName, $methodName, $programID, $vars = '', $from = 'program') - { - if($from != 'program') return helper::createLink('product', 'all', "programID={$programID}" . $vars); - - if($moduleName == 'project') - { - $moduleName = 'program'; - $methodName = 'project'; - } - if($moduleName == 'product') - { - $moduleName = 'program'; - $methodName = 'product'; - } - - return helper::createLink($moduleName, $methodName, "programID={$programID}"); - } - /** * 获取一级项目集id:name的键值对。 * Get top program pairs. diff --git a/module/program/test/model/getlink.php b/module/program/test/model/getlink.php deleted file mode 100644 index 06b5354cc1..0000000000 --- a/module/program/test/model/getlink.php +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env php -> project -非项目集页面跳转项目集列表 >> all - -*/ - -global $tester; -$tester->loadModel('program'); -$link1 = $tester->program->getLink('program', 'project', 1); -$result = ''; -if(strpos($link1, 'project')) $result = 'project'; -r($result) && p() && e('project'); // 项目集页面跳转项目集项目列表 - -$link2 = $tester->program->getLink('program', 'project', 1, '', 'product'); -if(strpos($link2, 'all')) $result = 'all'; -r($result) && p() && e('all'); // 非项目集页面跳转项目集列表 diff --git a/module/program/zen.php b/module/program/zen.php index fc115a4253..6dcc5e4582 100644 --- a/module/program/zen.php +++ b/module/program/zen.php @@ -117,4 +117,34 @@ class programZen extends program } return $result; } + + /** + * 获取下拉树菜单的链接。 + * Get link for drop tree menu. + * + * @param string $moduleName + * @param string $methodName + * @param int $programID + * @param string $vars + * @param string $from + * @access protected + * @return string + */ + protected function getLink(string $moduleName, string $methodName, string $programID, string $vars = '', string$from = 'program'): string + { + if($from != 'program') return helper::createLink('product', 'all', "programID={$programID}" . $vars); + + if($moduleName == 'project') + { + $moduleName = 'program'; + $methodName = 'project'; + } + if($moduleName == 'product') + { + $moduleName = 'program'; + $methodName = 'product'; + } + + return helper::createLink($moduleName, $methodName, "programID={$programID}"); + } }