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

* Finish task#56360.

Browse Source
This commit is contained in:
leiyong
2022-06-07 07:55:58 +00:00
parent 6a1f0a9562
commit bb31bbdca2
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/bug/model.php
View File

@@ -1868,6 +1868,8 @@ class bugModel extends model
if(!empty($this->config->isINT)) $firstLetter = '';
$users[$account] = $firstLetter . ($user->realname ? $user->realname : $user->account);
}
$users = $this->loadModel('user')->processAccountSort($users);
return array('' => '') + $users;
}

26
module/user/model.php
View File

@@ -136,6 +136,9 @@ class userModel extends model
}
}
// Put the current user first.
$users = $this->processAccountSort($users);
/* Append empty, closed, and guest users. */
if(strpos($params, 'noempty') === false) $users = array('' => '') + $users;
if(strpos($params, 'noclosed') === false) $users = $users + array('closed' => 'Closed');
@@ -2623,6 +2626,10 @@ class userModel extends model
if(!empty($this->config->isINT)) $firstLetter = '';
$users[$account] = $firstLetter . ($user->realname ? $user->realname : $user->account);
}
// Put the current user first.
$users = $this->processAccountSort($users);
return array('' => '') + $users;
}
@@ -2828,4 +2835,23 @@ class userModel extends model
$admins = explode(',', trim($company->admins, ','));
$this->app->user = $this->dao->select('*')->from(TABLE_USER)->where('account')->eq($admins[0])->fetch();
}
/**
* Put the current user first.
*
* @param array $users
* @access public
* @return array
*/
public function processAccountSort($users = array())
{
if(isset($users[$this->app->user->account]))
{
$currentUser = array();
$currentUser[$this->app->user->account] = $users[$this->app->user->account];
unset($users[$this->app->user->account]);
$users = $currentUser + $users;
}
return $users;
}
}