Skip to content

fix: 修复权限组视野变更后用户视图未刷新的问题 #188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
whjstc wants to merge 1 commit into
base: main
Choose a base branch
from
+38 −4
Open

fix: 修复权限组视野变更后用户视图未刷新的问题 #188

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 38 additions & 4 deletions module/group/model.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,21 @@ public function updateView(int $groupID, array $actions)

$actions = empty($actions) ? '' : json_encode($actions);
$this->dao->update(TABLE_GROUP)->set('acl')->eq($actions)->where('id')->eq($groupID)->exec();

if(!dao::isError())
{
$accounts = $this->dao->select('account')->from(TABLE_USERGROUP)->where('`group`')->eq($groupID)->fetchPairs();
$this->loadModel('setting')->setItem('system.common.userview.relatedTablesUpdateTime', time());
$this->loadModel('user');
foreach($accounts as $account)
{
if(!$account) continue;
$rights = $this->user->authorize($account);
$userView = $this->user->grantUserView($account, zget($rights, 'acls', array()), zget($rights, 'projects', ''));
$this->dao->replace(TABLE_USERVIEW)->data($userView)->exec();
}
}

return !dao::isError();
}

Expand Down Expand Up @@ -654,7 +669,6 @@ public function updateUser(int $groupID): bool
$delUsers = array_diff($groupUsers, $members);

if(!empty($delUsers)) $this->dao->delete()->from(TABLE_USERGROUP)->where('`group`')->eq($groupID)->andWhere('account')->in($delUsers)->exec();
if(empty($newUsers)) return !dao::isError();

$data = new stdclass();
$data->group = $groupID;
Expand All @@ -665,6 +679,23 @@ public function updateUser(int $groupID): bool
$this->dao->insert(TABLE_USERGROUP)->data($data)->exec();
}

if(!dao::isError())
{
$affectedUsers = array_merge($newUsers, $delUsers);
if(!empty($affectedUsers))
{
$this->loadModel('setting')->setItem('system.common.userview.relatedTablesUpdateTime', time());
$this->loadModel('user');
foreach($affectedUsers as $account)
{
if(!$account) continue;
$rights = $this->user->authorize($account);
$userView = $this->user->grantUserView($account, zget($rights, 'acls', array()), zget($rights, 'projects', ''));
$this->dao->replace(TABLE_USERVIEW)->data($userView)->exec();
}
}
}

return !dao::isError();
}

Expand Down Expand Up @@ -1075,13 +1106,16 @@ public function getRelatedPrivs(array $allPrivList, array $selectedPrivList, arr
{
/* Show related privs when select. */
if($type == 'recommend' && in_array($privCode, $recommendSelect)) $relatedPrivs[$type][$privCode] = $privCode;
if($type == 'depend') $depends[$privCode] = $priv['depend'];

if(!in_array($privCode, $selectedPrivList) || !isset($priv[$type])) continue;

foreach($priv[$type] as $relatedPriv)
foreach($priv[$type] as $code => $relatedPriv)
{
if(!in_array($relatedPriv, $selectedPrivList) && in_array($relatedPriv, $allPrivList)) $relatedPrivs[$type][$relatedPriv] = $relatedPriv;
if(!in_array($relatedPriv, $selectedPrivList) && in_array($relatedPriv, $allPrivList))
{
$relatedPrivs[$type][$relatedPriv] = $relatedPriv;
if($type == 'depend') $depends[$privCode][$code] = $relatedPriv;
}
}
}
}
Expand Down