mirror of
https://github.com/jumpserver/jumpserver.git
synced 2025-09-14 14:29:21 +00:00
perf: 支持全局的 labels (#12043)
* perf: 支持全局的 labels * perf: stash * stash * stash * stash * stash * perf: 优化 labels * stash * perf: add debug sql * perf: 修改 labels * perf: 优化提交 * perf: 优化提交 labels * perf: 基本完成 * perf: 完成 labels 搜索 * perf: 优化 labels * perf: 去掉不用 debug --------- Co-authored-by: ibuler <ibuler@qq.com>
This commit is contained in:
@@ -3,7 +3,8 @@
|
||||
from django.db.models import Count
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
from common.serializers.mixin import ObjectRelatedField
|
||||
from common.serializers.fields import ObjectRelatedField
|
||||
from common.serializers.mixin import ResourceLabelsMixin
|
||||
from orgs.mixins.serializers import BulkOrgResourceModelSerializer
|
||||
from .. import utils
|
||||
from ..models import User, UserGroup
|
||||
@@ -13,7 +14,7 @@ __all__ = [
|
||||
]
|
||||
|
||||
|
||||
class UserGroupSerializer(BulkOrgResourceModelSerializer):
|
||||
class UserGroupSerializer(ResourceLabelsMixin, BulkOrgResourceModelSerializer):
|
||||
users = ObjectRelatedField(
|
||||
required=False, many=True, queryset=User.objects, label=_('User'),
|
||||
)
|
||||
@@ -24,7 +25,7 @@ class UserGroupSerializer(BulkOrgResourceModelSerializer):
|
||||
fields_small = fields_mini + [
|
||||
'comment', 'date_created', 'created_by'
|
||||
]
|
||||
fields = fields_mini + fields_small + ['users']
|
||||
fields = fields_mini + fields_small + ['users', 'labels']
|
||||
extra_kwargs = {
|
||||
'created_by': {'label': _('Created by'), 'read_only': True},
|
||||
'users_amount': {'label': _('Users amount')},
|
||||
@@ -43,5 +44,6 @@ class UserGroupSerializer(BulkOrgResourceModelSerializer):
|
||||
@classmethod
|
||||
def setup_eager_loading(cls, queryset):
|
||||
""" Perform necessary eager loading of data. """
|
||||
queryset = queryset.prefetch_related('users').annotate(users_amount=Count('users'))
|
||||
queryset = queryset.prefetch_related('users', 'labels', 'labels__label') \
|
||||
.annotate(users_amount=Count('users'))
|
||||
return queryset
|
||||
|
Reference in New Issue
Block a user