Skip to content

Fixes 18286: Replace DurationChoices by JobIntervalChoices #18642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 14, 2025
Merged

Fixes 18286: Replace DurationChoices by JobIntervalChoices #18642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions netbox/core/choices.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')),
)


Expand Down
11 changes: 0 additions & 11 deletions netbox/extras/choices.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,17 +178,6 @@ class LogLevelChoices(ChoiceSet):
}


class DurationChoices(ChoiceSet):

CHOICES = (
(60, _('Hourly')),
(720, _('12 hours')),
(1440, _('Daily')),
(10080, _('Weekly')),
(43200, _('30 days')),
)


#
# Webhooks
#
Expand Down
4 changes: 2 additions & 2 deletions netbox/extras/forms/reports.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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)")
)
Expand Down
4 changes: 2 additions & 2 deletions netbox/extras/forms/scripts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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)")
)
Expand Down