diff --git a/netbox/core/forms/model_forms.py b/netbox/core/forms/model_forms.py index 16cf95f3f..bcfabe265 100644 --- a/netbox/core/forms/model_forms.py +++ b/netbox/core/forms/model_forms.py @@ -107,18 +107,10 @@ class ManagedFileForm(SyncedDataMixin, NetBoxModelForm): def clean(self): super().clean() - upload_file = self.cleaned_data.get('upload_file') - data_source = self.cleaned_data.get('data_source') - data_file = self.cleaned_data.get('data_file') - - if upload_file and data_file: + if self.cleaned_data.get('upload_file') and self.cleaned_data.get('data_file'): raise forms.ValidationError(_("Cannot upload a file and sync from an existing file")) - if upload_file and data_source: - raise forms.ValidationError(_("Cannot upload a file and sync from a data source.")) - if data_source and not data_file: - raise forms.ValidationError(_("A data file must be specified when syncing from a data source.")) - if not upload_file and not data_file: - raise forms.ValidationError(_("Must upload a file or select a data source and data file to sync.")) + if not self.cleaned_data.get('upload_file') and not self.cleaned_data.get('data_file'): + raise forms.ValidationError(_("Must upload a file or select a data file to sync")) return self.cleaned_data