github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-10-23 00:38:39 +00:00
Code Issues Projects Releases Wiki Activity

[Update] 恢复到原来的sql (#3707)

Browse Source
This commit is contained in:
老广
2020-02-15 20:49:20 +08:00
committed by GitHub
parent 5f61f2b555
commit 8b8b11ce1e
6 changed files with 33 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/perms/utils/database_app_permission.py
View File

@@ -2,10 +2,10 @@
#
from django.utils.translation import ugettext as _
from django.db.models import Q
from orgs.utils import set_to_root_org
from ..models import DatabaseAppPermission
from common.utils import union_queryset
from common.tree import TreeNode
from applications.models import DatabaseApp
from assets.models import SystemUser
@@ -19,13 +19,12 @@ __all__ = [
def get_user_database_app_permissions(user, include_group=True):
permissions = DatabaseAppPermission.objects.all().valid().filter(users=user)
if include_group:
groups = user.groups.all()
groups_permissions = DatabaseAppPermission.objects.all().valid()\
.filter(user_groups__in=groups)
permissions = union_queryset(permissions, groups_permissions)
return permissions
arg = Q(users=user) | Q(user_groups__in=groups)
else:
arg = Q(users=user)
return DatabaseAppPermission.objects.all().valid().filter(arg)
def get_user_group_database_app_permission(user_group):