Skip to content

Commit 18aac79

Browse files
sudarevaauvipy
authored andcommitted
Fix raise ValidationError for simultaneous solar, crontab or interval in PeriodicTask model (#38)
1 parent ab2b5be commit 18aac79

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

django_celery_beat/models.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -320,11 +320,14 @@ def validate_unique(self, *args, **kwargs):
320320
'One of interval, crontab, or solar must be set.'
321321
]
322322
})
323-
if self.interval and self.crontab and self.solar:
323+
err_msg = 'Only one of interval, crontab, or solar must be set'
324+
if (self.interval and self.crontab) or (self.crontab and self.solar):
324325
raise ValidationError({
325-
'crontab': [
326-
'Only one of interval, crontab, or solar must be set'
327-
]
326+
'crontab': [err_msg]
327+
})
328+
if self.interval or self.solar:
329+
raise ValidationError({
330+
'solar': [err_msg]
328331
})
329332

330333
def save(self, *args, **kwargs):

0 commit comments

Comments
 (0)