Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gjl2004yn
jumpserver
提交
ff546774
J
jumpserver
项目概览
gjl2004yn
/
jumpserver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jumpserver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ff546774
编写于
5月 28, 2020
作者:
B
Bai
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'lina' of
https://github.com/jumpserver/jumpserver
into lina
上级
1f4fc9b6
f8142e23
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
25 addition
and
20 deletion
+25
-20
apps/perms/serializers/asset_permission.py
apps/perms/serializers/asset_permission.py
+3
-3
apps/perms/serializers/database_app_permission.py
apps/perms/serializers/database_app_permission.py
+22
-17
未找到文件。
apps/perms/serializers/asset_permission.py
浏览文件 @
ff546774
...
...
@@ -57,8 +57,8 @@ class AssetPermissionSerializer(BulkOrgResourceModelSerializer):
def
setup_eager_loading
(
cls
,
queryset
):
""" Perform necessary eager loading of data. """
queryset
=
queryset
.
annotate
(
users_amount
=
Count
(
'users'
),
user_groups_amount
=
Count
(
'user_groups'
),
assets_amount
=
Count
(
'assets'
),
nodes_amount
=
Count
(
'nodes'
),
system_users_amount
=
Count
(
'system_users'
)
users_amount
=
Count
(
'users'
,
distinct
=
True
),
user_groups_amount
=
Count
(
'user_groups'
,
distinct
=
True
),
assets_amount
=
Count
(
'assets'
,
distinct
=
True
),
nodes_amount
=
Count
(
'nodes'
,
distinct
=
True
),
system_users_amount
=
Count
(
'system_users'
,
distinct
=
True
)
)
return
queryset
apps/perms/serializers/database_app_permission.py
浏览文件 @
ff546774
...
...
@@ -13,20 +13,35 @@ __all__ = [
]
class
DatabaseAppPermissionSerializer
(
BulkOrgResourceModelSerializer
):
class
AmountMixin
:
@
classmethod
def
setup_eager_loading
(
cls
,
queryset
):
""" Perform necessary eager loading of data. """
queryset
=
queryset
.
annotate
(
users_amount
=
Count
(
'users'
,
distinct
=
True
),
user_groups_amount
=
Count
(
'user_groups'
,
distinct
=
True
),
database_apps_amount
=
Count
(
'database_apps'
,
distinct
=
True
),
system_users_amount
=
Count
(
'system_users'
,
distinct
=
True
)
)
return
queryset
class
DatabaseAppPermissionSerializer
(
AmountMixin
,
BulkOrgResourceModelSerializer
):
class
Meta
:
model
=
models
.
DatabaseAppPermission
list_serializer_class
=
AdaptedBulkListSerializer
fields
=
[
'id'
,
'name'
,
'users'
,
'user_groups'
,
'database_apps'
,
'system_users'
,
'comment'
,
'is_active'
,
'date_start'
,
'date_expired'
,
'is_valid'
,
'created_by'
,
'date_created'
'id'
,
'name'
,
'users'
,
'user_groups'
,
'database_apps'
,
'system_users'
,
'comment'
,
'is_active'
,
'date_start'
,
'date_expired'
,
'is_valid'
,
'created_by'
,
'date_created'
,
'users_amount'
,
'user_groups_amount'
,
'database_apps_amount'
,
'system_users_amount'
,
]
read_only_fields
=
[
'created_by'
,
'date_created'
,
'users_amount'
,
'user_groups_amount'
,
'database_apps_amount'
,
'system_users_amount'
,
]
read_only_fields
=
[
'created_by'
,
'date_created'
]
class
DatabaseAppPermissionListSerializer
(
BulkOrgResourceModelSerializer
):
class
DatabaseAppPermissionListSerializer
(
AmountMixin
,
BulkOrgResourceModelSerializer
):
is_expired
=
serializers
.
BooleanField
()
class
Meta
:
...
...
@@ -36,13 +51,3 @@ class DatabaseAppPermissionListSerializer(BulkOrgResourceModelSerializer):
'date_start'
,
'date_expired'
,
'is_valid'
,
'database_apps_amount'
,
'system_users_amount'
,
'created_by'
,
'date_created'
,
'is_expired'
]
@
classmethod
def
setup_eager_loading
(
cls
,
queryset
):
""" Perform necessary eager loading of data. """
queryset
=
queryset
.
annotate
(
users_amount
=
Count
(
'users'
,
distinct
=
True
),
user_groups_amount
=
Count
(
'user_groups'
,
distinct
=
True
),
database_apps_amount
=
Count
(
'database_apps'
,
distinct
=
True
),
system_users_amount
=
Count
(
'system_users'
,
distinct
=
True
)
)
return
queryset
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录