From f9431f1c293931046753c145fc7d2b2869667adf Mon Sep 17 00:00:00 2001 From: Alexander Haase Date: Thu, 13 Feb 2025 22:39:11 +0100 Subject: [PATCH] Replace DurationChoices by JobIntervalChoices --- netbox/core/choices.py | 2 ++ netbox/extras/choices.py | 11 ----------- netbox/extras/forms/reports.py | 4 ++-- netbox/extras/forms/scripts.py | 4 ++-- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/netbox/core/choices.py b/netbox/core/choices.py index 442acc26b..6603a7d4f 100644 --- a/netbox/core/choices.py +++ b/netbox/core/choices.py @@ -81,8 +81,10 @@ class JobIntervalChoices(ChoiceSet): CHOICES = ( (INTERVAL_MINUTELY, _('Minutely')), (INTERVAL_HOURLY, _('Hourly')), + (INTERVAL_HOURLY * 12, _('12 hours')), (INTERVAL_DAILY, _('Daily')), (INTERVAL_WEEKLY, _('Weekly')), + (INTERVAL_DAILY * 30, _('30 days')), ) diff --git a/netbox/extras/choices.py b/netbox/extras/choices.py index 3cd7daab4..8258f4aaf 100644 --- a/netbox/extras/choices.py +++ b/netbox/extras/choices.py @@ -178,17 +178,6 @@ class LogLevelChoices(ChoiceSet): } -class DurationChoices(ChoiceSet): - - CHOICES = ( - (60, _('Hourly')), - (720, _('12 hours')), - (1440, _('Daily')), - (10080, _('Weekly')), - (43200, _('30 days')), - ) - - # # Webhooks # diff --git a/netbox/extras/forms/reports.py b/netbox/extras/forms/reports.py index 95692b3f6..72d0417f2 100644 --- a/netbox/extras/forms/reports.py +++ b/netbox/extras/forms/reports.py @@ -1,7 +1,7 @@ from django import forms from django.utils.translation import gettext_lazy as _ -from extras.choices import DurationChoices +from core.choices import JobIntervalChoices from utilities.forms.widgets import DateTimePicker, NumberWithOptions from utilities.datetime import local_now @@ -22,7 +22,7 @@ class ReportForm(forms.Form): min_value=1, label=_("Recurs every"), widget=NumberWithOptions( - options=DurationChoices + options=JobIntervalChoices ), help_text=_("Interval at which this report is re-run (in minutes)") ) diff --git a/netbox/extras/forms/scripts.py b/netbox/extras/forms/scripts.py index 331f7f01f..8ac476544 100644 --- a/netbox/extras/forms/scripts.py +++ b/netbox/extras/forms/scripts.py @@ -1,7 +1,7 @@ from django import forms from django.utils.translation import gettext_lazy as _ -from extras.choices import DurationChoices +from core.choices import JobIntervalChoices from utilities.forms.widgets import DateTimePicker, NumberWithOptions from utilities.datetime import local_now @@ -28,7 +28,7 @@ class ScriptForm(forms.Form): min_value=1, label=_("Recurs every"), widget=NumberWithOptions( - options=DurationChoices + options=JobIntervalChoices ), help_text=_("Interval at which this script is re-run (in minutes)") )