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

fix: 修复收集用户interval等字段的校验

pull/6130/head^2
Bai 2021-05-17 18:26:43 +08:00 committed by Jiangjie.Bai
parent c8d7d42f66
commit ba35f5906b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/ops/mixin.py
View File

@ -103,12 +103,14 @@ class PeriodTaskModelMixin(models.Model):
class PeriodTaskSerializerMixin(serializers.Serializer): class PeriodTaskSerializerMixin(serializers.Serializer):
is_periodic = serializers.BooleanField(default=False, label=_("Periodic perform")) is_periodic = serializers.BooleanField(default=True, label=_("Periodic perform"))
crontab = serializers.CharField( crontab = serializers.CharField(
max_length=128, allow_blank=True, max_length=128, allow_blank=True,
allow_null=True, required=False, label=_('Regularly perform') allow_null=True, required=False, label=_('Regularly perform')
) )
interval = serializers.IntegerField(allow_null=True, required=False, label=_('Interval')) interval = serializers.IntegerField(
default=24, allow_null=True, required=False, label=_('Interval')
)
INTERVAL_MAX = 65535 INTERVAL_MAX = 65535
INTERVAL_MIN = 1 INTERVAL_MIN = 1
@ -122,7 +124,7 @@ class PeriodTaskSerializerMixin(serializers.Serializer):
return crontab return crontab
def validate_interval(self, interval): def validate_interval(self, interval):
if not interval: if not interval and not isinstance(interval, int):
return interval return interval
msg = _("Range {} to {}").format(self.INTERVAL_MIN, self.INTERVAL_MAX) msg = _("Range {} to {}").format(self.INTERVAL_MIN, self.INTERVAL_MAX)
if interval > self.INTERVAL_MAX or interval < self.INTERVAL_MIN: if interval > self.INTERVAL_MAX or interval < self.INTERVAL_MIN: