mirror of
https://github.com/open-webui/open-webui.git
synced 2025-12-16 06:15:23 +00:00
refac
This commit is contained in:
parent
be93081bd7
commit
4bc77b544e
1 changed files with 2 additions and 4 deletions
|
|
@ -60,8 +60,7 @@ def get_permissions(
|
||||||
|
|
||||||
# Combine permissions from all user groups
|
# Combine permissions from all user groups
|
||||||
for group in user_groups:
|
for group in user_groups:
|
||||||
group_permissions = group.permissions or {}
|
permissions = combine_permissions(permissions, group.permissions or {})
|
||||||
permissions = combine_permissions(permissions, group_permissions)
|
|
||||||
|
|
||||||
# Ensure all fields from default_permissions are present and filled in
|
# Ensure all fields from default_permissions are present and filled in
|
||||||
permissions = fill_missing_permissions(permissions, default_permissions)
|
permissions = fill_missing_permissions(permissions, default_permissions)
|
||||||
|
|
@ -96,8 +95,7 @@ def has_permission(
|
||||||
user_groups = Groups.get_groups_by_member_id(user_id)
|
user_groups = Groups.get_groups_by_member_id(user_id)
|
||||||
|
|
||||||
for group in user_groups:
|
for group in user_groups:
|
||||||
group_permissions = group.permissions
|
if get_permission(group.permissions or {}, permission_hierarchy):
|
||||||
if get_permission(group_permissions, permission_hierarchy):
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
# Check default permissions afterward if the group permissions don't allow it
|
# Check default permissions afterward if the group permissions don't allow it
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue