From b741ab4151a10b54e5d9b15ec3f4cf6511bc15df Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 10 May 2023 20:46:12 +0800
Subject: [PATCH] * Rename function name.

---
 module/common/model.php                                   | 2 +-
 module/project/control.php                                | 2 +-
 module/project/model.php                                  | 4 ++--
 .../model/{getprojectprivs.php => getprivsbymodel.php}    | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename module/project/test/model/{getprojectprivs.php => getprivsbymodel.php} (59%)

diff --git a/module/common/model.php b/module/common/model.php
index 0f5a3d03ce..cb6fe8179d 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -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)
diff --git a/module/project/control.php b/module/project/control.php
index 78cc9db9f4..ca4800a285 100755
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -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();
diff --git a/module/project/model.php b/module/project/model.php
index 6c64fd29aa..61fc31a7b3 100755
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -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;
 
diff --git a/module/project/test/model/getprojectprivs.php b/module/project/test/model/getprivsbymodel.php
similarity index 59%
rename from module/project/test/model/getprojectprivs.php
rename to module/project/test/model/getprivsbymodel.php
index 54f4b73c87..5c7b712467 100755
--- a/module/project/test/model/getprojectprivs.php
+++ b/module/project/test/model/getprivsbymodel.php
@@ -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'); // 传递正确类型的情况