diff --git a/module/project/model.php b/module/project/model.php index 4a72973af8..e756b9ffd5 100755 --- a/module/project/model.php +++ b/module/project/model.php @@ -45,7 +45,7 @@ class projectModel extends model * @access public * @return bool */ - public function checkPriv($projectID) + public function checkPriv($projectID): bool { return !empty($projectID) && ($this->app->user->admin || (strpos(",{$this->app->user->view->projects},", ",{$projectID},") !== false)); } @@ -1654,9 +1654,9 @@ class projectModel extends model * @param int $projectID * @param array $members * @access public - * @return void + * @return bool */ - public function manageMembers(int $projectID, array $members) + public function manageMembers(int $projectID, array $members): bool { $project = $this->projectTao->fetchProjectInfo($projectID); $oldJoin = $this->dao->select('`account`, `join`')->from(TABLE_TEAM)->where('root')->eq($projectID)->andWhere('type')->eq('project')->fetchPairs(); @@ -1694,6 +1694,8 @@ class projectModel extends model } if(empty($project->multiple) and $project->model != 'waterfall') $this->loadModel('execution')->syncNoMultipleSprint($projectID); + + return !dao::isError(); } /** @@ -1796,9 +1798,9 @@ class projectModel extends model * @param array $oldProjectProducts * @param array $members * @access public - * @return void + * @return bool */ - public function linkProducts(int $projectID, array $products, array $oldProjectProducts, array $members) + public function linkProducts(int $projectID, array $products, array $oldProjectProducts, array $members): bool { $this->loadModel('user'); @@ -1845,6 +1847,7 @@ class projectModel extends model $existedProducts[$productID][$branchID] = true; } } + return true; } /** @@ -1901,15 +1904,17 @@ class projectModel extends model * @param int $projectID * @param array $users * @access public - * @return void + * @return bool */ - public function updateInvolvedUserView(int $projectID, array $users = array()): void + public function updateInvolvedUserView(int $projectID, array $users = array()): bool { $products = $this->dao->select('product')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($projectID)->fetchPairs('product', 'product'); $this->loadModel('user')->updateUserView($products, 'product', $users); $executions = $this->dao->select('id')->from(TABLE_EXECUTION)->where('project')->eq($projectID)->fetchPairs('id', 'id'); if($executions) $this->user->updateUserView($executions, 'sprint', $users); + + return true; } /** @@ -2005,9 +2010,9 @@ class projectModel extends model * Get stats for project kanban. * * @access public - * @return void + * @return array */ - public function getStats4Kanban() + public function getStats4Kanban(): array { /* Get execution of the status is doing. */ $executions = $this->loadModel('execution')->getStatData(0, 'doing', 0, 0, false, 'hasParentName|skipParent'); diff --git a/module/project/test/model/managemembers.php b/module/project/test/model/managemembers.php index f8e6ae814c..ac3a8807bc 100755 --- a/module/project/test/model/managemembers.php +++ b/module/project/test/model/managemembers.php @@ -50,50 +50,50 @@ cid=1 $projectClass = new project(); $members1[0] = new stdclass(); -$members1[0]->accounts = 'user1'; -$members1[0]->roles = '研发'; +$members1[0]->account = 'user1'; +$members1[0]->role = '研发'; $members1[0]->days = 10; $members1[0]->hours = 7.5; $members1[0]->limited = 'no'; $members1[1] = new stdclass(); -$members1[1]->accounts = 'user2'; -$members1[1]->roles = '测试'; +$members1[1]->account = 'user2'; +$members1[1]->role = '测试'; $members1[1]->days = 8; $members1[1]->hours = 8.0; $members1[1]->limited = 'yes'; $members1[2] = new stdclass(); -$members1[2]->accounts = 'user3'; -$members1[2]->roles = '产品经理'; +$members1[2]->account = 'user3'; +$members1[2]->role = '产品经理'; $members1[2]->days = 5; $members1[2]->hours = 5.0; $members1[2]->limited = 'no'; $members2[0] = new stdclass(); -$members2[0]->accounts = 'user11'; -$members2[0]->roles = '测试'; +$members2[0]->account = 'user11'; +$members2[0]->role = '测试'; $members2[0]->days = 300; $members2[0]->hours = 20.5; $members2[0]->limited = 'no'; $members2[1] = new stdclass(); -$members2[1]->accounts = 'user12'; -$members2[1]->roles = '项目经理'; +$members2[1]->account = 'user12'; +$members2[1]->role = '项目经理'; $members2[1]->days = 700; $members2[1]->hours = 25; $members2[1]->limited = 'yes'; $members2[2] = new stdclass(); -$members2[2]->accounts = 'user13'; -$members2[2]->roles = '产品经理'; +$members2[2]->account = 'user13'; +$members2[2]->role = '产品经理'; $members2[2]->days = 10; $members2[2]->hours = 11.0; $members2[2]->limited = 'no'; $members2[3] = new stdclass(); -$members2[3]->accounts = 'user13'; -$members2[3]->roles = '产品经理'; +$members2[3]->account = 'user13'; +$members2[3]->role = '产品经理'; $members2[3]->days = 10; $members2[3]->hours = 11.0; $members2[3]->limited = 'no'; diff --git a/module/project/test/model/suspend.php b/module/project/test/model/suspend.php index d85d724cc4..3e35ba4c2a 100755 --- a/module/project/test/model/suspend.php +++ b/module/project/test/model/suspend.php @@ -24,6 +24,7 @@ cid=1 */ global $tester; +$_POST['uid'] = '0'; $tester->loadModel('project'); initData();