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

Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'

Browse Source 
* recover user

See merge request easycorp/zentaopms!3872
This commit is contained in:
王怡栋
2022-06-13 02:09:30 +00:00
parent c89ca73832 7c6b288878
commit 6325ce1ccc
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
module/user/control.php
View File

@@ -1187,21 +1187,18 @@ class user extends control
* @param int $contactListID
* @param string $dropdownName mailto|whitelist
* @param string $oldUsers
* @param string $extra
* @access public
* @return string
*/
public function ajaxGetContactUsers($contactListID, $dropdownName = 'mailto', $oldUsers = '', $extra = '')
public function ajaxGetContactUsers($contactListID, $dropdownName = 'mailto', $oldUsers = '')
{
$list = $contactListID ? $this->user->getContactListByID($contactListID) : '';
$attr = $dropdownName == 'mailto' ? "data-placeholder='{$this->lang->chooseUsersToMail}'" : '';
$users = $this->user->getPairs('devfirst|nodeleted|noclosed', $list ? $list->userList : '', $this->config->maxCount);
if(!empty($extra) && $extra == 'flow') $users = array_merge(array('deptManager' => $this->lang->workflowdatasource->options['deptManager']), $users);
if(isset($this->config->user->moreLink)) $this->config->moreLinks[$dropdownName . "[]"] = $this->config->user->moreLink;
$defaultUsers = empty($contactListID) ? '' : $list->userList . ',' . trim($oldUsers);
if($extra == 'flow' && empty($defaultUsers)) $defaultUsers = trim($oldUsers);
return print(html::select($dropdownName . "[]", $users, $defaultUsers, "class='form-control chosen' multiple $attr"));
}