From d6a8c04d45c379cf952fc59be1541d3c4d965600 Mon Sep 17 00:00:00 2001 From: BaiJiangJie Date: Thu, 30 May 2019 16:02:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E8=B5=84=E4=BA=A7=E4=BF=A1=E6=81=AF=E6=97=B6=E8=BF=94?= =?UTF-8?q?=E5=9B=9Eorg=5Fid=E5=AD=97=E6=AE=B5=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/api/asset.py | 2 +- apps/orgs/mixins.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/assets/api/asset.py b/apps/assets/api/asset.py index 9e21c81be..c7bbeb094 100644 --- a/apps/assets/api/asset.py +++ b/apps/assets/api/asset.py @@ -51,7 +51,7 @@ class AssetViewSet(IDInCacheFilterMixin, LabelFilter, BulkModelViewSet): def set_assets_node(self, assets): if not isinstance(assets, list): assets = [assets] - node = Node.objects.get(value='Default') + node = Node.root() node_id = self.request.query_params.get('node_id') if node_id: node = get_object_or_none(Node, pk=node_id) diff --git a/apps/orgs/mixins.py b/apps/orgs/mixins.py index 431443ebe..80b9f0d35 100644 --- a/apps/orgs/mixins.py +++ b/apps/orgs/mixins.py @@ -212,5 +212,9 @@ class OrgResourceSerializerMixin(serializers.Serializer): """ 通过API批量操作资源时, 自动给每个资源添加所需属性org_id的值为current_org_id (同时为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.HiddenField(default=get_current_org_id) + org_id = serializers.CharField(default=get_current_org_id) From ec60697912648720520f450b74e265ccb5a0d5da Mon Sep 17 00:00:00 2001 From: BaiJiangJie Date: Thu, 30 May 2019 16:07:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E7=BB=86?= =?UTF-8?q?=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/orgs/mixins.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/orgs/mixins.py b/apps/orgs/mixins.py index 80b9f0d35..f41ffccbe 100644 --- a/apps/orgs/mixins.py +++ b/apps/orgs/mixins.py @@ -212,9 +212,7 @@ class OrgResourceSerializerMixin(serializers.Serializer): """ 通过API批量操作资源时, 自动给每个资源添加所需属性org_id的值为current_org_id (同时为serializer.is_valid()对Model的unique_together校验做准备) - - - 如果是HiddenField，API获取资产信息时，org_id不可读，但是coco需要资产的org_id字段， - 所以修改为CharField类型 + 由于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)