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

* Fix bug #14841.

Browse Source
This commit is contained in:
tianshujie
2022-03-30 14:48:34 +08:00
parent be96ca9323
commit b452680fb3
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/group/css/managemember.css
+2 -1
View File
@@ -1,2 +1,3 @@
.group-item {display: block; width: 100px; float: left; margin-bottom: 5px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;}
.group-item {display: block; width: 100px; float: left; margin-bottom: 2px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;}
.table th {vertical-align: top;}
.main-table tbody>tr>td {border-bottom: 0px;}
module/group/view/managemember.html.php
+1 -1
View File
@@ -58,7 +58,7 @@
<?php endforeach;?>
</td>
</tr>
<?php if($config->systemMode == 'new'):?>
<?php if($config->systemMode == 'new' and !empty($outsideUsers)):?>
<tr>
<th class='w-140px'>
<div class="checkbox-primary checkbox-inline checkbox-right check-all">
module/project/control.php
+18
View File
@@ -1411,13 +1411,31 @@ class project extends control
}
$group = $this->group->getById($groupID);
$project = $this->project->getByID($group->project);
$groupUsers = $this->group->getUserPairs($groupID);
$allUsers = $this->loadModel('dept')->getDeptUserPairs($deptID);
$otherUsers = array_diff_assoc($allUsers, $groupUsers);
if($project->acl != 'open')
{
$canViewMembers = $this->dao->select('account')->from(TABLE_USERVIEW)->where("CONCAT(',', projects, ',')")->like("%,$group->project,%")->fetchPairs();
foreach($otherUsers as $account => $otherUser)
{
if(!isset($canViewMembers[$account])) unset($otherUsers[$account]);
}
}
if($this->config->systemMode == 'new')
{
$outsideUsers = $this->loadModel('user')->getPairs('outside|noclosed|noletter|noempty');
if($project->acl != 'open')
{
foreach($outsideUsers as $account => $outsideUser)
{
if(!isset($canViewMembers[$account])) unset($outsideUsers[$account]);
}
}
$this->view->outsideUsers = array_diff_assoc($outsideUsers, $groupUsers);
}