github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-07 18:31:04 +00:00
Code Issues Projects Releases Wiki Activity

perf: change domain to zone (#15255)

Browse Source 
* perf: change domain to zone

* perf: change domain to zone

* perf: change some word

* perf: update gateway enabled i18n

* perf: change migrations

---------

Co-authored-by: ibuler <ibuler@qq.com>
This commit is contained in:
fit2bot
2025-04-21 10:30:18 +08:00
committed by GitHub
parent 57fcebfdd3
commit 3159a4e794
40 changed files with 178 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/perms/serializers/user_permission.py
View File

@@ -25,12 +25,12 @@ class AssetPermedSerializer(OrgResourceModelSerializerMixin, ResourceLabelsMixin
platform = ObjectRelatedField(required=False, queryset=Platform.objects, label=_('Platform'))
category = LabeledChoiceField(choices=Category.choices, read_only=True, label=_('Category'))
type = LabeledChoiceField(choices=AllTypes.choices(), read_only=True, label=_('Type'))
domain = ObjectRelatedField(required=False, queryset=Node.objects, label=_('Domain'))
zone = ObjectRelatedField(required=False, read_only=True, label=_('Zone'))
class Meta:
model = Asset
only_fields = [
'id', 'name', 'address', 'domain', 'platform',
'id', 'name', 'address', 'zone', 'platform',
'comment', 'org_id', 'is_active', 'date_verified',
'created_by', 'date_created', 'connectivity', 'nodes', 'labels'
]
@@ -40,7 +40,7 @@ class AssetPermedSerializer(OrgResourceModelSerializerMixin, ResourceLabelsMixin
@classmethod
def setup_eager_loading(cls, queryset):
""" Perform necessary eager loading of data. """
queryset = queryset.prefetch_related('domain', 'nodes') \
queryset = queryset.prefetch_related('zone', 'nodes') \
.prefetch_related('platform') \
.annotate(category=F("platform__category")) \
.annotate(type=F("platform__type"))