Closes 20817 fix datasource sync broken when cron is set

netbox/core/choices.py

@@ -13,13 +13,15 @@ class DataSourceStatusChoices(ChoiceSet):
     SYNCING = 'syncing'
     COMPLETED = 'completed'
     FAILED = 'failed'
+    READY = 'ready'
 
     CHOICES = (
         (NEW, _('New'), 'blue'),
         (QUEUED, _('Queued'), 'orange'),
         (SYNCING, _('Syncing'), 'cyan'),
         (COMPLETED, _('Completed'), 'green'),
         (FAILED, _('Failed'), 'red'),
+        (READY, _('Ready'), 'green'),
     )
 
 

netbox/core/forms/model_forms.py

@@ -16,6 +16,7 @@
 from utilities.forms.fields import CommentField, JSONField
 from utilities.forms.rendering import FieldSet
 from utilities.forms.widgets import HTMXSelect
+from core.choices import DataSourceStatusChoices
 
 __all__ = (
     'ConfigRevisionForm',
@@ -79,14 +80,24 @@ def __init__(self, *args, **kwargs):
                 if self.instance and self.instance.parameters:
                     self.fields[field_name].initial = self.instance.parameters.get(name)
 
-    def save(self, *args, **kwargs):
+    def clean(self):
+        super().clean()
+        if not self.instance.pk:
+            self.cleaned_data['status'] = DataSourceStatusChoices.NEW
+        else:
+            if not self.data.get('sync_interval'):
+                self.cleaned_data['status'] = DataSourceStatusChoices.READY
 
+    def save(self, *args, **kwargs):
         parameters = {}
         for name in self.fields:
             if name.startswith('backend_'):
                 parameters[name[8:]] = self.cleaned_data[name]
         self.instance.parameters = parameters
 
+        # update status
+        self.instance.status = self.cleaned_data.get('status', self.instance.status)
+
         return super().save(*args, **kwargs)
 
 

netbox/core/jobs.py

@@ -31,7 +31,6 @@ def enqueue(cls, *args, **kwargs):
 
         # Update the DataSource's synchronization status to queued
         if datasource := job.object:
-            datasource.status = DataSourceStatusChoices.QUEUED
             DataSource.objects.filter(pk=datasource.pk).update(status=datasource.status)
 
         return job

netbox/core/models/data.py

@@ -112,7 +112,6 @@ def backend_class(self):
     @property
     def ready_for_sync(self):
         return self.enabled and self.status not in (
-            DataSourceStatusChoices.QUEUED,
             DataSourceStatusChoices.SYNCING
         )