Merge branch '180'

This commit is contained in:
孙广明
2022-01-04 22:41:23 +08:00
84 changed files with 627 additions and 253 deletions
+32 -1
View File
@@ -92,7 +92,7 @@ class doc extends control
$pager = new pager($recTotal, $recPerPage, $pageID);
/* Append id for secend sort. */
$sort = $this->loadModel('common')->appendOrder($orderBy);
$sort = common::appendOrder($orderBy);
if($browseType == 'collectedbyme')
{
@@ -778,6 +778,37 @@ class doc extends control
$this->doc->saveDraft($docID);
}
/**
* Ajax get doclib whitelist.
*
* @param int $doclibID
* @param string $acl open|custom|private
* @access public
* @return string
*/
public function ajaxGetWhitelist($doclibID, $acl)
{
$doclib = $this->doc->getLibById($doclibID);
$users = $this->user->getPairs('noletter|noempty|noclosed');
if($doclib->acl != 'custom' and !empty($doclib->project) and $acl == 'custom')
{
$project = $this->loadModel('project')->getById($doclib->project);
$userList = array();
$projectTeams = $this->loadModel('user')->getTeamMemberPairs($doclib->project);
$stakeholders = $this->loadModel('stakeholder')->getStakeHolderPairs($doclib->project);
foreach($stakeholders as $stakeholder) $userList[$stakeholder] = $users[$stakeholder];
$userList += $projectTeams;
$whitelist = implode(',', array_keys($userList)) . $project->whitelist . ',' .$project->PM . ',' . $doclib->users;
return print(html::select('users[]', $users, $whitelist, "class='form-control chosen' multiple"));
}
return print(html::select('users[]', $users, $doclib->users, "class='form-control chosen' multiple"));
}
/**
* Show files.
*