* Rename function name.
This commit is contained in:
@@ -2658,7 +2658,7 @@ EOF;
|
||||
if($program->auth == 'reset')
|
||||
{
|
||||
/* If priv way is reset, unset common program priv, and cover by program priv. */
|
||||
$projectPrivs = $this->loadModel('project')->getProjectPrivs($program->multiple ? $program->model : 'noSprint');
|
||||
$projectPrivs = $this->loadModel('project')->getPrivsByModel($program->multiple ? $program->model : 'noSprint');
|
||||
foreach($projectPrivs as $module => $methods)
|
||||
{
|
||||
foreach($methods as $method => $label)
|
||||
|
||||
@@ -1417,7 +1417,7 @@ class project extends control
|
||||
}
|
||||
|
||||
$this->view->project = $project;
|
||||
$this->lang->resource = $this->project->getProjectPrivs($project->multiple ? $project->model : 'noSprint');
|
||||
$this->lang->resource = $this->project->getPrivsByModel($project->multiple ? $project->model : 'noSprint');
|
||||
}
|
||||
|
||||
$this->display();
|
||||
|
||||
@@ -925,13 +925,13 @@ class projectModel extends model
|
||||
|
||||
/**
|
||||
* 根据项目类型生成权限数据。
|
||||
* Get project priv data according to the project type.
|
||||
* Get project priv data according by the project type.
|
||||
*
|
||||
* @param string $model scrum|waterfall|noSprint|agileplus|waterfallplus
|
||||
* @access public
|
||||
* @return object|false
|
||||
*/
|
||||
public function getProjectPrivs(string $model = 'waterfall'): object|false
|
||||
public function getPrivsByModel(string $model = 'waterfall'): object|false
|
||||
{
|
||||
if(!in_array($model, array_keys((array)$this->config->programPriv))) return false;
|
||||
|
||||
|
||||
+4
-4
@@ -5,7 +5,7 @@ su('admin');
|
||||
|
||||
/**
|
||||
|
||||
title=测试 projectModel->getProjectPrivs();
|
||||
title=测试 projectModel->getPrivsByModel();
|
||||
timeout=0
|
||||
cid=1
|
||||
|
||||
@@ -14,6 +14,6 @@ cid=1
|
||||
global $tester;
|
||||
$projectTester = $tester->loadModel('project');
|
||||
|
||||
r($projectTester->getProjectPrivs('')) && p() && e('0'); // 传递空类型的情况
|
||||
r($projectTester->getProjectPrivs('test')) && p() && e('0'); // 传递错误的类型的情况
|
||||
r($projectTester->getProjectPrivs('scrum')) && p('bug:delete') && e('deleteAction'); // 传递正确类型的情况
|
||||
r($projectTester->getPrivsByModel('')) && p() && e('0'); // 传递空类型的情况
|
||||
r($projectTester->getPrivsByModel('test')) && p() && e('0'); // 传递错误的类型的情况
|
||||
r($projectTester->getPrivsByModel('scrum')) && p('bug:delete') && e('deleteAction'); // 传递正确类型的情况
|
||||
Reference in New Issue
Block a user