From afb2d0ed95a8149b442afea83c2ed7d58814e1ba Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Tue, 26 Dec 2017 11:35:05 +0100 Subject: [PATCH] correct the CronJob model The day relation was missing and all the times should be optional because the can be combined. --- docs/docs.org | 10 +++++++--- inventory/models.py | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/docs/docs.org b/docs/docs.org index 176c26d..bf04b89 100644 --- a/docs/docs.org +++ b/docs/docs.org @@ -303,9 +303,13 @@ class CronJob(models.Model): name = models.CharField(max_length=50) host = models.ForeignKey(Computer, on_delete=models.CASCADE) command = models.CharField(max_length=50) - time = models.TimeField() - weekday = models.ForeignKey(Weekday, on_delete=models.CASCADE) - month = models.ForeignKey(Month, on_delete=models.CASCADE) + time = models.TimeField(null=True, blank=True,) + weekday = models.ForeignKey(Weekday, on_delete=models.CASCADE, + null=True, blank=True,) + day = models.ForeignKey(DayOfMonth, on_delete=models.CASCADE, + null=True, blank=True,) + month = models.ForeignKey(Month, on_delete=models.CASCADE, + null=True, blank=True,) def __str__(self): return self.name diff --git a/inventory/models.py b/inventory/models.py index 962890d..2488528 100644 --- a/inventory/models.py +++ b/inventory/models.py @@ -218,9 +218,13 @@ class CronJob(models.Model): name = models.CharField(max_length=50) host = models.ForeignKey(Computer, on_delete=models.CASCADE) command = models.CharField(max_length=50) - time = models.TimeField() - weekday = models.ForeignKey(Weekday, on_delete=models.CASCADE) - month = models.ForeignKey(Month, on_delete=models.CASCADE) + time = models.TimeField(null=True, blank=True,) + weekday = models.ForeignKey(Weekday, on_delete=models.CASCADE, + null=True, blank=True,) + day = models.ForeignKey(DayOfMonth, on_delete=models.CASCADE, + null=True, blank=True,) + month = models.ForeignKey(Month, on_delete=models.CASCADE, + null=True, blank=True,) def __str__(self): return self.name