Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Finish task #37551.

Browse Source
This commit is contained in:
tianshujie98
2021-04-15 16:02:02 +08:00
parent 160a359b13
commit 4aad17c101
12 changed files with 71 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+3 -3
View File
@@ -542,7 +542,7 @@ class execution extends control
$position[] = $this->lang->execution->importBug;
/* Get users, products and executions.*/
$users = $this->execution->getTeamMemberPairs($executionID, 'nodeleted');
$users = $this->loadModel('user')->getTeamMemberPairs($executionID, 'execution', 'nodeleted');
$products = $this->dao->select('t1.product, t2.name')->from(TABLE_PROJECTPRODUCT)->alias('t1')
->leftJoin(TABLE_PRODUCT)->alias('t2')
->on('t1.product = t2.id')
@@ -2502,7 +2502,7 @@ class execution extends control
$this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name);
$this->view->position[] = $this->lang->execution->dynamic;
$this->view->userIdPairs = $this->execution->getTeamMemberPairs($executionID, 'nodeleted|useid');
$this->view->userIdPairs = $this->loadModel('user')->getTeamMemberPairs($executionID, 'execution', 'nodeleted|useid');
$this->view->accountPairs = $this->loadModel('user')->getPairs('noletter|nodeleted');
/* Assign. */
@@ -2540,7 +2540,7 @@ class execution extends control
*/
public function ajaxGetMembers($executionID, $assignedTo = '')
{
$users = $this->execution->getTeamMemberPairs($executionID);
$users = $this->loadModel('user')->getTeamMemberPairs($executionID, 'execution');
if($this->app->getViewType() === 'json')
{
die(json_encode($users));
module/execution/model.php
+3 -40
View File
@@ -429,7 +429,7 @@ class executionModel extends model
}
/* Get team and language item. */
$team = $this->getTeamMemberPairs($executionID);
$team = $this->loadModel('user')->getTeamMemberPairs($executionID, 'execution');
$this->lang->execution->team = $this->lang->execution->teamname;
/* Get the data from the post. */
@@ -562,7 +562,7 @@ class executionModel extends model
foreach($executions as $executionID => $execution)
{
$oldExecution = $oldExecutions[$executionID];
$team = $this->getTeamMemberPairs($executionID);
$team = $this->loadModel('user')->getTeamMemberPairs($executionID, 'execution');
$this->dao->update(TABLE_EXECUTION)->data($execution)
->autoCheck($skipFields = 'begin,end')
@@ -1739,7 +1739,7 @@ class executionModel extends model
unset($stories[0]);
/* Add members to execution team. */
$teamMembers = $this->getTeamMemberPairs($executionID);
$teamMembers = $this->loadModel('user')->getTeamMemberPairs($executionID, 'execution');
foreach($assignedToes as $account => $preExecutionID)
{
if(!isset($teamMembers[$account]))
@@ -2174,43 +2174,6 @@ class executionModel extends model
->fetchAll('account');
}
/**
* Get team members in pair.
*
* @param int $executionID
* @param string $params
* @param string $usersToAppended
* @access public
* @return array
*/
public function getTeamMemberPairs($executionID, $params = '', $usersToAppended = '')
{
if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getTeamMembersPairs();
$this->app->loadConfig('user');
$keyField = strpos($params, 'useid') !== false ? 'id' : 'account';
$users = $this->dao->select("t2.id, t2.account, t2.realname")->from(TABLE_TEAM)->alias('t1')
->leftJoin(TABLE_USER)->alias('t2')->on('t1.account = t2.account')
->where('t1.root')->eq((int)$executionID)
->andWhere('t1.type')->eq('execution')
->beginIF($params == 'nodeleted' or empty($this->config->user->showDeleted))
->andWhere('t2.deleted')->eq(0)
->fi()
->fetchAll($keyField);
if($usersToAppended) $users += $this->dao->select("id, account, realname")->from(TABLE_USER)->where('account')->in($usersToAppended)->fetchAll($keyField);
if(!$users) return array('' => '');
foreach($users as $account => $user)
{
$firstLetter = ucfirst(substr($user->account, 0, 1)) . ':';
if(!empty($this->config->isINT)) $firstLetter = '';
$users[$account] = $firstLetter . ($user->realname ? $user->realname : $user->account);
}
return array('' => '') + $users;
}
/**
* Get the skip members of the team.
*