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

Merge pull request #2756 from jumpserver/dev 

Dev
pull/2790/head^2
BaiJiangJie 2019-05-30 16:08:44 +08:00 committed by GitHub
parent d46f5858f8 63a06b5dd8
commit 6ba78e2cf3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/api/asset.py
View File

@ -51,7 +51,7 @@ class AssetViewSet(IDInCacheFilterMixin, LabelFilter, BulkModelViewSet):
def set_assets_node(self, assets): def set_assets_node(self, assets):
if not isinstance(assets, list): if not isinstance(assets, list):
assets = [assets] assets = [assets]
node = Node.objects.get(value='Default') node = Node.root()
node_id = self.request.query_params.get('node_id') node_id = self.request.query_params.get('node_id')
if node_id: if node_id:
node = get_object_or_none(Node, pk=node_id) node = get_object_or_none(Node, pk=node_id)

4
apps/orgs/mixins.py
View File

@ -212,5 +212,7 @@ class OrgResourceSerializerMixin(serializers.Serializer):
""" """
通过API批量操作资源时, 自动给每个资源添加所需属性org_id的值为current_org_id 通过API批量操作资源时, 自动给每个资源添加所需属性org_id的值为current_org_id
(同时为serializer.is_valid()对Model的unique_together校验做准备) (同时为serializer.is_valid()对Model的unique_together校验做准备)
由于HiddenField字段不可读，API获取资产信息时获取不到org_id，
但是coco需要资产的org_id字段，所以修改为CharField类型
""" """
org_id = serializers.HiddenField(default=get_current_org_id) org_id = serializers.CharField(default=get_current_org_id)