github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

perf: 修改默认节点

pull/10235/head
ibuler 2023-04-18 16:29:41 +08:00
parent 52891bfca3
commit 5921b2ee8f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/accounts/serializers/account/account.py
View File

@ -59,7 +59,7 @@ class AccountCreateUpdateSerializerMixin(serializers.Serializer):
def set_uniq_name_if_need(self, initial_data, asset): def set_uniq_name_if_need(self, initial_data, asset):
name = initial_data.get('name') name = initial_data.get('name')
if name is None: if name is not None:
return return
if not name: if not name:
name = initial_data.get('username') name = initial_data.get('username')

5
apps/assets/serializers/asset/common.py
View File

@ -267,12 +267,13 @@ class AssetSerializer(BulkOrgResourceModelSerializer, WritableNestedModelSeriali
nodes_display = self.initial_data.get('nodes_display') nodes_display = self.initial_data.get('nodes_display')
if nodes_display: if nodes_display:
return nodes return nodes
default_node = Node.org_root()
request = self.context.get('request') request = self.context.get('request')
if not request: if not request:
return [] return [default_node]
node_id = request.query_params.get('node_id') node_id = request.query_params.get('node_id')
if not node_id: if not node_id:
return [] return [default_node]
nodes = Node.objects.filter(id=node_id) nodes = Node.objects.filter(id=node_id)
return nodes return nodes