mirror of https://github.com/jumpserver/jumpserver
[Update] 修改获取资产信息时返回org_id字段值
parent
a8491eafea
commit
d6a8c04d45
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue