github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-25 06:42:49 +00:00
Code Issues Projects Releases Wiki Activity

fix: 修改生成 inventory 错误代码，增加运行作业权限校验

Browse Source
This commit is contained in:
Aaron3S
2023-02-22 18:06:46 +08:00
parent d9a11900a9
commit 34386bd6fb
2 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/ops/serializers/job.py
View File

@@ -17,7 +17,7 @@ class JobSerializer(BulkOrgResourceModelSerializer, PeriodTaskSerializerMixin):
nodes = serializers.ListField(required=False, child=serializers.CharField())
date_last_run = serializers.DateTimeField(label=_('Date last run'), read_only=True)
name = serializers.CharField(label=_('Name'), max_length=128, allow_blank=True, required=False)
assets = serializers.PrimaryKeyRelatedField(label=_('Assets'), queryset=Asset.objects.all(), many=True,
assets = serializers.PrimaryKeyRelatedField(label=_('Assets'), queryset=Asset.objects, many=True,
required=False)
def to_internal_value(self, data):
@@ -32,12 +32,6 @@ class JobSerializer(BulkOrgResourceModelSerializer, PeriodTaskSerializerMixin):
user = request.user if request else None
return user
def validate_assets(self, assets):
permed_assets = UserPermAssetUtil(self.get_request_user()).get_all_assets()
if not set(assets).issubset(set(permed_assets)):
raise serializers.ValidationError(_('Assets not in user perm'))
return assets
def create(self, validated_data):
assets = validated_data.__getitem__('assets')
node_ids = validated_data.pop('nodes', None)