github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-06-26 15:01:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'v3' of github.com:jumpserver/jumpserver into v3

Browse Source
This commit is contained in:
Jiangjie.Bai 2022-09-29 20:42:08 +08:00
commit 79a21bbc08
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/acls/serializers/login_asset_acl.py
View File

@ -57,7 +57,7 @@ class LoginAssetACLAccountsSerializer(serializers.Serializer):
class LoginAssetACLSerializer(BulkOrgResourceModelSerializer): class LoginAssetACLSerializer(BulkOrgResourceModelSerializer):
users = LoginAssetACLUsersSerializer() users = LoginAssetACLUsersSerializer()
assets = LoginAssetACLAssestsSerializer() assets = LoginAssetACLAssestsSerializer()
account = LoginAssetACLAccountsSerializer() accounts = LoginAssetACLAccountsSerializer()
reviewers_amount = serializers.IntegerField(read_only=True, source='reviewers.count') reviewers_amount = serializers.IntegerField(read_only=True, source='reviewers.count')
action_display = serializers.ReadOnlyField(source='get_action_display', label=_('Action')) action_display = serializers.ReadOnlyField(source='get_action_display', label=_('Action'))

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

@ -108,7 +108,6 @@ class AssetSerializer(JMSWritableNestedModelSerializer):
instance.nodes.set(nodes_to_set) instance.nodes.set(nodes_to_set)
def validate_nodes(self, nodes): def validate_nodes(self, nodes):
print("Nodes: ", nodes)
if nodes: if nodes:
return nodes return nodes
request = self.context.get('request') request = self.context.get('request')

7
apps/perms/api/user_permission/assets/mixin.py
View File

@ -32,8 +32,8 @@ class UserDirectGrantedAssetsQuerysetMixin:
class UserAllGrantedAssetsQuerysetMixin: class UserAllGrantedAssetsQuerysetMixin:
only_fields = serializers.AssetGrantedSerializer.Meta.only_fields only_fields = serializers.AssetGrantedSerializer.Meta.only_fields
pagination_class = AllGrantedAssetPagination pagination_class = AllGrantedAssetPagination
ordering_fields = ("hostname", "address", "port", "cpu_cores") ordering_fields = ("name", "address", "port", "cpu_cores")
ordering = ('hostname', ) ordering = ('name', )
user: User user: User
@ -41,7 +41,8 @@ class UserAllGrantedAssetsQuerysetMixin:
if getattr(self, 'swagger_fake_view', False): if getattr(self, 'swagger_fake_view', False):
return Asset.objects.none() return Asset.objects.none()
queryset = UserGrantedAssetsQueryUtils(self.user).get_all_granted_assets() queryset = UserGrantedAssetsQueryUtils(self.user).get_all_granted_assets()
queryset = queryset.prefetch_related('platform').only(*self.only_fields) only_fields = [i for i in self.only_fields if i not in ['protocols']]
queryset = queryset.prefetch_related('platform', 'protocols').only(*only_fields)
return queryset return queryset